You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/10/21 14:33:43 UTC

[camel] branch master updated (e9696b5 -> 4a5c4b8)

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

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


    from e9696b5  Polished
     new 35b17c4  CAMEL-15722: endpoint uri builder: add an option to URL encode the returned uri or not
     new 4a5c4b8  CAMEL-15722: Regen

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


Summary of changes:
 .../activemq/ActiveMQEndpointUriFactory.java       |  4 +-
 .../component/ahc/ws/WsEndpointUriFactory.java     |  4 +-
 .../camel/component/ahc/AhcEndpointUriFactory.java |  4 +-
 .../component/amqp/AMQPEndpointUriFactory.java     |  4 +-
 .../component/apns/ApnsEndpointUriFactory.java     |  4 +-
 .../arangodb/ArangoDbEndpointUriFactory.java       |  4 +-
 .../camel/component/as2/AS2EndpointUriFactory.java |  4 +-
 .../asterisk/AsteriskEndpointUriFactory.java       |  4 +-
 .../atlasmap/AtlasMapEndpointUriFactory.java       |  4 +-
 .../component/atmos/AtmosEndpointUriFactory.java   |  4 +-
 .../websocket/WebsocketEndpointUriFactory.java     |  4 +-
 .../component/atom/AtomEndpointUriFactory.java     |  4 +-
 .../client/map/AtomixMapEndpointUriFactory.java    |  4 +-
 .../AtomixMessagingEndpointUriFactory.java         |  4 +-
 .../multimap/AtomixMultiMapEndpointUriFactory.java |  4 +-
 .../queue/AtomixQueueEndpointUriFactory.java       |  4 +-
 .../client/set/AtomixSetEndpointUriFactory.java    |  4 +-
 .../value/AtomixValueEndpointUriFactory.java       |  4 +-
 .../component/avro/AvroEndpointUriFactory.java     |  4 +-
 .../component/aws/cw/CwEndpointUriFactory.java     |  4 +-
 .../component/aws/ddb/DdbEndpointUriFactory.java   |  4 +-
 .../aws/ddbstream/DdbStreamEndpointUriFactory.java |  4 +-
 .../component/aws/ec2/EC2EndpointUriFactory.java   |  4 +-
 .../component/aws/ecs/ECSEndpointUriFactory.java   |  4 +-
 .../component/aws/eks/EKSEndpointUriFactory.java   |  4 +-
 .../component/aws/iam/IAMEndpointUriFactory.java   |  4 +-
 .../KinesisFirehoseEndpointUriFactory.java         |  4 +-
 .../aws/kinesis/KinesisEndpointUriFactory.java     |  4 +-
 .../component/aws/kms/KMSEndpointUriFactory.java   |  4 +-
 .../aws/lambda/LambdaEndpointUriFactory.java       |  4 +-
 .../component/aws/mq/MQEndpointUriFactory.java     |  4 +-
 .../component/aws/msk/MSKEndpointUriFactory.java   |  4 +-
 .../component/aws/s3/S3EndpointUriFactory.java     |  4 +-
 .../component/aws/sdb/SdbEndpointUriFactory.java   |  4 +-
 .../component/aws/ses/SesEndpointUriFactory.java   |  4 +-
 .../component/aws/sns/SnsEndpointUriFactory.java   |  4 +-
 .../component/aws/sqs/SqsEndpointUriFactory.java   |  4 +-
 .../component/aws/swf/SWFEndpointUriFactory.java   |  4 +-
 .../aws/translate/TranslateEndpointUriFactory.java |  4 +-
 .../aws2/athena/Athena2EndpointUriFactory.java     |  4 +-
 .../component/aws2/cw/Cw2EndpointUriFactory.java   |  4 +-
 .../component/aws2/ddb/Ddb2EndpointUriFactory.java |  4 +-
 .../ddbstream/Ddb2StreamEndpointUriFactory.java    |  4 +-
 .../aws2/ec2/AWS2EC2EndpointUriFactory.java        |  4 +-
 .../component/aws2/ecs/ECS2EndpointUriFactory.java |  4 +-
 .../component/aws2/eks/EKS2EndpointUriFactory.java |  4 +-
 .../eventbridge/EventbridgeEndpointUriFactory.java |  4 +-
 .../component/aws2/iam/IAM2EndpointUriFactory.java |  4 +-
 .../KinesisFirehose2EndpointUriFactory.java        |  4 +-
 .../aws2/kinesis/Kinesis2EndpointUriFactory.java   |  4 +-
 .../component/aws2/kms/KMS2EndpointUriFactory.java |  4 +-
 .../aws2/lambda/Lambda2EndpointUriFactory.java     |  4 +-
 .../component/aws2/mq/MQ2EndpointUriFactory.java   |  4 +-
 .../component/aws2/msk/MSK2EndpointUriFactory.java |  4 +-
 .../aws2/s3/AWS2S3EndpointUriFactory.java          |  4 +-
 .../component/aws2/ses/Ses2EndpointUriFactory.java |  4 +-
 .../component/aws2/sns/Sns2EndpointUriFactory.java |  4 +-
 .../component/aws2/sqs/Sqs2EndpointUriFactory.java |  4 +-
 .../component/aws2/sts/STS2EndpointUriFactory.java |  4 +-
 .../translate/Translate2EndpointUriFactory.java    |  4 +-
 .../eventhubs/EventHubsEndpointUriFactory.java     |  4 +-
 .../azure/storage/blob/BlobEndpointUriFactory.java |  4 +-
 .../storage/queue/QueueEndpointUriFactory.java     |  4 +-
 .../azure/blob/BlobServiceEndpointUriFactory.java  |  4 +-
 .../queue/QueueServiceEndpointUriFactory.java      |  4 +-
 .../validator/BeanValidatorEndpointUriFactory.java |  4 +-
 .../component/bean/BeanEndpointUriFactory.java     |  4 +-
 .../beanclass/ClassEndpointUriFactory.java         |  4 +-
 .../beanstalk/BeanstalkEndpointUriFactory.java     |  4 +-
 .../component/bonita/BonitaEndpointUriFactory.java |  4 +-
 .../camel/component/box/BoxEndpointUriFactory.java |  4 +-
 .../braintree/BraintreeEndpointUriFactory.java     |  4 +-
 .../component/browse/BrowseEndpointUriFactory.java |  4 +-
 .../cache/CaffeineCacheEndpointUriFactory.java     |  4 +-
 .../load/CaffeineLoadCacheEndpointUriFactory.java  |  4 +-
 .../cassandra/CassandraEndpointUriFactory.java     |  4 +-
 .../chatscript/ChatScriptEndpointUriFactory.java   |  4 +-
 .../component/chunk/ChunkEndpointUriFactory.java   |  4 +-
 .../camel/component/cm/CMEndpointUriFactory.java   |  4 +-
 .../component/cmis/CMISEndpointUriFactory.java     |  4 +-
 .../apache/camel/coap/CoAPEndpointUriFactory.java  |  4 +-
 .../component/cometd/CometdEndpointUriFactory.java |  4 +-
 .../component/consul/ConsulEndpointUriFactory.java |  4 +-
 .../controlbus/ControlBusEndpointUriFactory.java   |  4 +-
 .../component/corda/CordaEndpointUriFactory.java   |  4 +-
 .../couchbase/CouchbaseEndpointUriFactory.java     |  4 +-
 .../couchdb/CouchDbEndpointUriFactory.java         |  4 +-
 .../component/cron/CronEndpointUriFactory.java     |  4 +-
 .../crypto/cms/CryptoCmsEndpointUriFactory.java    |  4 +-
 .../crypto/DigitalSignatureEndpointUriFactory.java |  4 +-
 .../camel/component/cxf/CxfEndpointUriFactory.java |  4 +-
 .../cxf/jaxrs/CxfRsEndpointUriFactory.java         |  4 +-
 .../dataformat/DataFormatEndpointUriFactory.java   |  4 +-
 .../dataset/DataSetEndpointUriFactory.java         |  4 +-
 .../dataset/DataSetTestEndpointUriFactory.java     |  4 +-
 .../DebeziumMongodbEndpointUriFactory.java         |  4 +-
 .../debezium/DebeziumMySqlEndpointUriFactory.java  |  4 +-
 .../DebeziumPostgresEndpointUriFactory.java        |  4 +-
 .../DebeziumSqlserverEndpointUriFactory.java       |  4 +-
 .../DigitalOceanEndpointUriFactory.java            |  4 +-
 .../component/direct/DirectEndpointUriFactory.java |  4 +-
 .../directvm/DirectVmEndpointUriFactory.java       |  4 +-
 .../disruptor/DisruptorEndpointUriFactory.java     |  4 +-
 .../vm/DisruptorVmEndpointUriFactory.java          |  4 +-
 .../camel/component/djl/DJLEndpointUriFactory.java |  4 +-
 .../camel/component/dns/DnsEndpointUriFactory.java |  4 +-
 .../component/docker/DockerEndpointUriFactory.java |  4 +-
 .../component/dozer/DozerEndpointUriFactory.java   |  4 +-
 .../component/drill/DrillEndpointUriFactory.java   |  4 +-
 .../dropbox/DropboxEndpointUriFactory.java         |  4 +-
 .../ehcache/EhcacheEndpointUriFactory.java         |  4 +-
 .../ElasticsearchEndpointUriFactory.java           |  4 +-
 .../component/elsql/ElsqlEndpointUriFactory.java   |  4 +-
 .../component/etcd/EtcdKeysEndpointUriFactory.java |  4 +-
 .../etcd/EtcdStatsEndpointUriFactory.java          |  4 +-
 .../etcd/EtcdWatchEndpointUriFactory.java          |  4 +-
 .../component/exec/ExecEndpointUriFactory.java     |  4 +-
 .../facebook/FacebookEndpointUriFactory.java       |  4 +-
 .../component/fhir/FhirEndpointUriFactory.java     |  4 +-
 .../file/watch/FileWatchEndpointUriFactory.java    |  4 +-
 .../component/file/FileEndpointUriFactory.java     |  4 +-
 .../flatpack/FlatpackEndpointUriFactory.java       |  4 +-
 .../component/flink/FlinkEndpointUriFactory.java   |  4 +-
 .../camel/component/fop/FopEndpointUriFactory.java |  4 +-
 .../freemarker/FreemarkerEndpointUriFactory.java   |  4 +-
 .../file/remote/FtpEndpointUriFactory.java         |  4 +-
 .../file/remote/FtpsEndpointUriFactory.java        |  4 +-
 .../file/remote/SftpEndpointUriFactory.java        |  4 +-
 .../ganglia/GangliaEndpointUriFactory.java         |  4 +-
 .../geocoder/GeoCoderEndpointUriFactory.java       |  4 +-
 .../camel/component/git/GitEndpointUriFactory.java |  4 +-
 .../component/github/GitHubEndpointUriFactory.java |  4 +-
 .../bigquery/GoogleBigQueryEndpointUriFactory.java |  4 +-
 .../sql/GoogleBigQuerySQLEndpointUriFactory.java   |  4 +-
 .../calendar/GoogleCalendarEndpointUriFactory.java |  4 +-
 .../GoogleCalendarStreamEndpointUriFactory.java    |  4 +-
 .../drive/GoogleDriveEndpointUriFactory.java       |  4 +-
 .../google/mail/GoogleMailEndpointUriFactory.java  |  4 +-
 .../stream/GoogleMailStreamEndpointUriFactory.java |  4 +-
 .../pubsub/GooglePubsubEndpointUriFactory.java     |  4 +-
 .../sheets/GoogleSheetsEndpointUriFactory.java     |  4 +-
 .../GoogleSheetsStreamEndpointUriFactory.java      |  4 +-
 .../component/gora/GoraEndpointUriFactory.java     |  4 +-
 .../component/grape/GrapeEndpointUriFactory.java   |  4 +-
 .../graphql/GraphqlEndpointUriFactory.java         |  4 +-
 .../component/grpc/GrpcEndpointUriFactory.java     |  4 +-
 .../eventbus/GuavaEventBusEndpointUriFactory.java  |  4 +-
 .../HazelcastAtomicnumberEndpointUriFactory.java   |  4 +-
 .../HazelcastInstanceEndpointUriFactory.java       |  4 +-
 .../list/HazelcastListEndpointUriFactory.java      |  4 +-
 .../map/HazelcastMapEndpointUriFactory.java        |  4 +-
 .../HazelcastMultimapEndpointUriFactory.java       |  4 +-
 .../queue/HazelcastQueueEndpointUriFactory.java    |  4 +-
 .../HazelcastReplicatedmapEndpointUriFactory.java  |  4 +-
 .../HazelcastRingbufferEndpointUriFactory.java     |  4 +-
 .../seda/HazelcastSedaEndpointUriFactory.java      |  4 +-
 .../set/HazelcastSetEndpointUriFactory.java        |  4 +-
 .../topic/HazelcastTopicEndpointUriFactory.java    |  4 +-
 .../component/hbase/HBaseEndpointUriFactory.java   |  4 +-
 .../component/hdfs/HdfsEndpointUriFactory.java     |  4 +-
 .../component/http/HttpEndpointUriFactory.java     |  4 +-
 .../iec60870/client/ClientEndpointUriFactory.java  |  4 +-
 .../iec60870/server/ServerEndpointUriFactory.java  |  4 +-
 .../infinispan/InfinispanEndpointUriFactory.java   |  4 +-
 .../influxdb/InfluxDbEndpointUriFactory.java       |  4 +-
 .../component/iota/IOTAEndpointUriFactory.java     |  4 +-
 .../component/ipfs/IPFSEndpointUriFactory.java     |  4 +-
 .../camel/component/irc/IrcEndpointUriFactory.java |  4 +-
 .../component/ironmq/IronMQEndpointUriFactory.java |  4 +-
 .../component/jbpm/JBPMEndpointUriFactory.java     |  4 +-
 .../component/jcache/JCacheEndpointUriFactory.java |  4 +-
 .../jclouds/JcloudsEndpointUriFactory.java         |  4 +-
 .../camel/component/jcr/JcrEndpointUriFactory.java |  4 +-
 .../component/jdbc/JdbcEndpointUriFactory.java     |  4 +-
 .../jetty9/JettyHttp9EndpointUriFactory.java       |  4 +-
 .../raft/JGroupsRaftEndpointUriFactory.java        |  4 +-
 .../jgroups/JGroupsEndpointUriFactory.java         |  4 +-
 .../validator/jing/JingEndpointUriFactory.java     |  4 +-
 .../component/jira/JiraEndpointUriFactory.java     |  4 +-
 .../camel/component/jms/JmsEndpointUriFactory.java |  4 +-
 .../camel/component/jmx/JMXEndpointUriFactory.java |  4 +-
 .../component/jolt/JoltEndpointUriFactory.java     |  4 +-
 .../component/jooq/JooqEndpointUriFactory.java     |  4 +-
 .../camel/component/jpa/JpaEndpointUriFactory.java |  4 +-
 .../camel/component/scp/ScpEndpointUriFactory.java |  4 +-
 .../component/jslt/JsltEndpointUriFactory.java     |  4 +-
 .../JsonValidatorEndpointUriFactory.java           |  4 +-
 .../jsonata/JsonataEndpointUriFactory.java         |  4 +-
 .../component/jt400/Jt400EndpointUriFactory.java   |  4 +-
 .../component/kafka/KafkaEndpointUriFactory.java   |  4 +-
 .../KubernetesConfigMapsEndpointUriFactory.java    |  4 +-
 .../KubernetesDeploymentsEndpointUriFactory.java   |  4 +-
 .../hpa/KubernetesHPAEndpointUriFactory.java       |  4 +-
 .../job/KubernetesJobEndpointUriFactory.java       |  4 +-
 .../KubernetesNamespacesEndpointUriFactory.java    |  4 +-
 .../nodes/KubernetesNodesEndpointUriFactory.java   |  4 +-
 ...ernetesPersistentVolumesEndpointUriFactory.java |  4 +-
 ...sPersistentVolumesClaimsEndpointUriFactory.java |  4 +-
 .../pods/KubernetesPodsEndpointUriFactory.java     |  4 +-
 ...esReplicationControllersEndpointUriFactory.java |  4 +-
 ...KubernetesResourcesQuotaEndpointUriFactory.java |  4 +-
 .../KubernetesSecretsEndpointUriFactory.java       |  4 +-
 ...ubernetesServiceAccountsEndpointUriFactory.java |  4 +-
 .../KubernetesServicesEndpointUriFactory.java      |  4 +-
 .../OpenshiftBuildConfigsEndpointUriFactory.java   |  4 +-
 .../builds/OpenshiftBuildsEndpointUriFactory.java  |  4 +-
 .../component/kudu/KuduEndpointUriFactory.java     |  4 +-
 .../language/LanguageEndpointUriFactory.java       |  4 +-
 .../component/ldap/LdapEndpointUriFactory.java     |  4 +-
 .../component/ldif/LdifEndpointUriFactory.java     |  4 +-
 .../camel/component/log/LogEndpointUriFactory.java |  4 +-
 .../component/lucene/LuceneEndpointUriFactory.java |  4 +-
 .../lumberjack/LumberjackEndpointUriFactory.java   |  4 +-
 .../component/mail/MailEndpointUriFactory.java     |  4 +-
 .../component/master/MasterEndpointUriFactory.java |  4 +-
 .../metrics/MetricsEndpointUriFactory.java         |  4 +-
 .../micrometer/MicrometerEndpointUriFactory.java   |  4 +-
 .../MicroProfileMetricsEndpointUriFactory.java     |  4 +-
 .../milo/client/MiloClientEndpointUriFactory.java  |  4 +-
 .../milo/server/MiloServerEndpointUriFactory.java  |  4 +-
 .../component/mina/MinaEndpointUriFactory.java     |  4 +-
 .../component/minio/MinioEndpointUriFactory.java   |  4 +-
 .../component/mllp/MllpEndpointUriFactory.java     |  4 +-
 .../component/mock/MockEndpointUriFactory.java     |  4 +-
 .../mongodb/gridfs/GridFsEndpointUriFactory.java   |  4 +-
 .../mongodb/MongoDbEndpointUriFactory.java         |  4 +-
 .../validator/msv/MsvEndpointUriFactory.java       |  4 +-
 .../mustache/MustacheEndpointUriFactory.java       |  4 +-
 .../component/mvel/MvelEndpointUriFactory.java     |  4 +-
 .../mybatis/MyBatisBeanEndpointUriFactory.java     |  4 +-
 .../mybatis/MyBatisEndpointUriFactory.java         |  4 +-
 .../component/nagios/NagiosEndpointUriFactory.java |  4 +-
 .../component/nats/NatsEndpointUriFactory.java     |  4 +-
 .../netty/http/NettyHttpEndpointUriFactory.java    |  4 +-
 .../component/netty/NettyEndpointUriFactory.java   |  4 +-
 .../nitrite/NitriteEndpointUriFactory.java         |  4 +-
 .../camel/component/nsq/NsqEndpointUriFactory.java |  4 +-
 .../oaipmh/component/OAIPMHEndpointUriFactory.java |  4 +-
 .../olingo2/Olingo2EndpointUriFactory.java         |  4 +-
 .../olingo4/Olingo4EndpointUriFactory.java         |  4 +-
 .../openstack/cinder/CinderEndpointUriFactory.java |  4 +-
 .../openstack/glance/GlanceEndpointUriFactory.java |  4 +-
 .../keystone/KeystoneEndpointUriFactory.java       |  4 +-
 .../neutron/NeutronEndpointUriFactory.java         |  4 +-
 .../openstack/nova/NovaEndpointUriFactory.java     |  4 +-
 .../openstack/swift/SwiftEndpointUriFactory.java   |  4 +-
 .../optaplanner/OptaPlannerEndpointUriFactory.java |  4 +-
 .../component/paho/PahoEndpointUriFactory.java     |  4 +-
 .../camel/component/pdf/PdfEndpointUriFactory.java |  4 +-
 .../slot/PgReplicationSlotEndpointUriFactory.java  |  4 +-
 .../pgevent/PgEventEndpointUriFactory.java         |  4 +-
 .../http/PlatformHttpEndpointUriFactory.java       |  4 +-
 .../printer/PrinterEndpointUriFactory.java         |  4 +-
 .../component/pubnub/PubNubEndpointUriFactory.java |  4 +-
 .../component/pulsar/PulsarEndpointUriFactory.java |  4 +-
 .../component/quartz/QuartzEndpointUriFactory.java |  4 +-
 .../quickfixj/QuickfixjEndpointUriFactory.java     |  4 +-
 .../rabbitmq/RabbitMQEndpointUriFactory.java       |  4 +-
 .../streams/ReactiveStreamsEndpointUriFactory.java |  4 +-
 .../camel/component/ref/RefEndpointUriFactory.java |  4 +-
 .../openapi/RestOpenApiEndpointUriFactory.java     |  4 +-
 .../swagger/RestSwaggerEndpointUriFactory.java     |  4 +-
 .../component/rest/RestApiEndpointUriFactory.java  |  4 +-
 .../component/rest/RestEndpointUriFactory.java     |  4 +-
 .../resteasy/ResteasyEndpointUriFactory.java       |  4 +-
 .../RobotFrameworkEndpointUriFactory.java          |  4 +-
 .../camel/component/rss/RssEndpointUriFactory.java |  4 +-
 .../component/saga/SagaEndpointUriFactory.java     |  4 +-
 .../salesforce/SalesforceEndpointUriFactory.java   |  4 +-
 .../sap/netweaver/NetWeaverEndpointUriFactory.java |  4 +-
 .../component/xquery/XQueryEndpointUriFactory.java |  4 +-
 .../scheduler/SchedulerEndpointUriFactory.java     |  4 +-
 .../schematron/SchematronEndpointUriFactory.java   |  4 +-
 .../component/seda/SedaEndpointUriFactory.java     |  4 +-
 .../service/ServiceEndpointUriFactory.java         |  4 +-
 .../servicenow/ServiceNowEndpointUriFactory.java   |  4 +-
 .../servlet/ServletEndpointUriFactory.java         |  4 +-
 .../camel/component/sip/SipEndpointUriFactory.java |  4 +-
 .../component/sjms/SjmsEndpointUriFactory.java     |  4 +-
 .../sjms/batch/SjmsBatchEndpointUriFactory.java    |  4 +-
 .../component/sjms2/Sjms2EndpointUriFactory.java   |  4 +-
 .../component/slack/SlackEndpointUriFactory.java   |  4 +-
 .../component/smpp/SmppEndpointUriFactory.java     |  4 +-
 .../component/snmp/SnmpEndpointUriFactory.java     |  4 +-
 .../component/solr/SolrEndpointUriFactory.java     |  4 +-
 .../component/SoroushBotEndpointUriFactory.java    |  4 +-
 .../component/spark/SparkEndpointUriFactory.java   |  4 +-
 .../splunkhec/SplunkHECEndpointUriFactory.java     |  4 +-
 .../component/splunk/SplunkEndpointUriFactory.java |  4 +-
 .../batch/SpringBatchEndpointUriFactory.java       |  4 +-
 .../SpringIntegrationEndpointUriFactory.java       |  4 +-
 .../springldap/SpringLdapEndpointUriFactory.java   |  4 +-
 .../component/redis/RedisEndpointUriFactory.java   |  4 +-
 .../ws/SpringWebserviceEndpointUriFactory.java     |  4 +-
 .../component/event/EventEndpointUriFactory.java   |  4 +-
 .../camel/component/sql/SqlEndpointUriFactory.java |  4 +-
 .../sql/stored/SqlStoredEndpointUriFactory.java    |  4 +-
 .../camel/component/ssh/SshEndpointUriFactory.java |  4 +-
 .../component/stax/StAXEndpointUriFactory.java     |  4 +-
 .../component/stomp/StompEndpointUriFactory.java   |  4 +-
 .../component/stream/StreamEndpointUriFactory.java |  4 +-
 .../StringTemplateEndpointUriFactory.java          |  4 +-
 .../component/stub/StubEndpointUriFactory.java     |  4 +-
 .../telegram/TelegramEndpointUriFactory.java       |  4 +-
 .../component/thrift/ThriftEndpointUriFactory.java |  4 +-
 .../component/tika/TikaEndpointUriFactory.java     |  4 +-
 .../component/timer/TimerEndpointUriFactory.java   |  4 +-
 .../component/twilio/TwilioEndpointUriFactory.java |  4 +-
 .../TwitterDirectMessageEndpointUriFactory.java    |  4 +-
 .../search/TwitterSearchEndpointUriFactory.java    |  4 +-
 .../TwitterTimelineEndpointUriFactory.java         |  4 +-
 .../undertow/UndertowEndpointUriFactory.java       |  4 +-
 .../validator/ValidatorEndpointUriFactory.java     |  4 +-
 .../velocity/VelocityEndpointUriFactory.java       |  4 +-
 .../vertx/http/VertxHttpEndpointUriFactory.java    |  4 +-
 .../VertxWebsocketEndpointUriFactory.java          |  4 +-
 .../component/vertx/VertxEndpointUriFactory.java   |  4 +-
 .../camel/component/vm/VmEndpointUriFactory.java   |  4 +-
 .../weather/WeatherEndpointUriFactory.java         |  4 +-
 .../component/web3j/Web3jEndpointUriFactory.java   |  4 +-
 .../webhook/WebhookEndpointUriFactory.java         |  4 +-
 .../jsr356/JSR356WebSocketEndpointUriFactory.java  |  4 +-
 .../websocket/WebsocketEndpointUriFactory.java     |  4 +-
 .../component/weka/WekaEndpointUriFactory.java     |  4 +-
 .../wordpress/WordpressEndpointUriFactory.java     |  4 +-
 .../workday/WorkdayEndpointUriFactory.java         |  4 +-
 .../xchange/XChangeEndpointUriFactory.java         |  4 +-
 .../camel/component/xj/XJEndpointUriFactory.java   |  4 +-
 .../xmlsecurity/XmlSignerEndpointUriFactory.java   |  4 +-
 .../xmlsecurity/XmlVerifierEndpointUriFactory.java |  4 +-
 .../component/xmpp/XmppEndpointUriFactory.java     |  4 +-
 .../xslt/saxon/XsltSaxonEndpointUriFactory.java    |  4 +-
 .../component/xslt/XsltEndpointUriFactory.java     |  4 +-
 .../component/yammer/YammerEndpointUriFactory.java |  4 +-
 .../zendesk/ZendeskEndpointUriFactory.java         |  4 +-
 .../zookeepermaster/MasterEndpointUriFactory.java  |  4 +-
 .../zookeeper/ZooKeeperEndpointUriFactory.java     |  4 +-
 .../org/apache/camel/spi/EndpointUriFactory.java   | 14 +++-
 .../catalog/CustomEndpointUriFactoryTest.java      | 74 +++++++++++++++++++---
 .../component/EndpointUriFactorySupport.java       |  4 +-
 .../packaging/EndpointUriFactoryGenerator.java     |  4 +-
 341 files changed, 757 insertions(+), 687 deletions(-)


[camel] 01/02: CAMEL-15722: endpoint uri builder: add an option to URL encode the returned uri or not

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

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

commit 35b17c47cb14bc1e266a4a469e78d6c2ab25f211
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Wed Oct 21 12:11:26 2020 +0200

    CAMEL-15722: endpoint uri builder: add an option to URL encode the returned uri or not
---
 .../org/apache/camel/spi/EndpointUriFactory.java   | 14 +++-
 .../catalog/CustomEndpointUriFactoryTest.java      | 74 +++++++++++++++++++---
 .../component/EndpointUriFactorySupport.java       |  4 +-
 .../packaging/EndpointUriFactoryGenerator.java     |  4 +-
 4 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriFactory.java
index 1eb4d99..35530e6 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriFactory.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriFactory.java
@@ -42,7 +42,19 @@ public interface EndpointUriFactory extends CamelContextAware {
      * @param  properties endpoint options
      * @return            the constructed endpoint uri
      */
-    String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException;
+    default String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+        return buildUri(scheme, properties, true);
+    }
+
+    /**
+     * Assembles an endpoint uri for the given component name with the given parameters.
+     *
+     * @param  scheme     the component name
+     * @param  properties endpoint options
+     * @param  encode     whether to URL encode the returned uri or not
+     * @return            the constructed endpoint uri
+     */
+    String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException;
 
     /**
      * Returns all the names this endpoint supports.
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriFactoryTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriFactoryTest.java
index a6eafaf..97bb0c7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriFactoryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriFactoryTest.java
@@ -215,6 +215,27 @@ public class CustomEndpointUriFactoryTest extends ContextTestSupport {
     }
 
     @Test
+    public void testCQLAssembler() throws Exception {
+        EndpointUriFactory assembler = new MyCQLAssembler();
+        assembler.setCamelContext(context);
+
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("host", "localhost");
+        params.put("keyspace", "test");
+        params.put("cql", "insert into test_data(id, text) values (now(), ?)");
+
+        Assertions.assertEquals(
+                "cql:localhost/test?cql=insert+into+test_data%28id%2C+text%29+values+%28now%28%29%2C+%3F%29",
+                assembler.buildUri("cql", new LinkedHashMap<>(params)));
+        Assertions.assertEquals(
+                "cql:localhost/test?cql=insert+into+test_data%28id%2C+text%29+values+%28now%28%29%2C+%3F%29",
+                assembler.buildUri("cql", new LinkedHashMap<>(params), true));
+        Assertions.assertEquals(
+                "cql:localhost/test?cql=insert into test_data(id, text) values (now(), ?)",
+                assembler.buildUri("cql", new LinkedHashMap<>(params), false));
+    }
+
+    @Test
     public void testJmsSecrets() throws Exception {
         EndpointUriFactory assembler = new MyJmsxAssembler();
         assembler.setCamelContext(context);
@@ -239,7 +260,7 @@ public class CustomEndpointUriFactoryTest extends ContextTestSupport {
         }
 
         @Override
-        public String buildUri(String scheme, Map<String, Object> properties)
+        public String buildUri(String scheme, Map<String, Object> properties, boolean encode)
                 throws URISyntaxException {
             // begin from syntax
             String uri = SYNTAX;
@@ -248,7 +269,7 @@ public class CustomEndpointUriFactoryTest extends ContextTestSupport {
             uri = buildPathParameter(SYNTAX, uri, "name", null, true, properties);
             uri = buildPathParameter(SYNTAX, uri, "port", 8080, false, properties);
             // append remainder parameters
-            uri = buildQueryParameters(uri, properties);
+            uri = buildQueryParameters(uri, properties, encode);
 
             return uri;
         }
@@ -280,7 +301,7 @@ public class CustomEndpointUriFactoryTest extends ContextTestSupport {
         }
 
         @Override
-        public String buildUri(String scheme, Map<String, Object> properties)
+        public String buildUri(String scheme, Map<String, Object> properties, boolean encode)
                 throws URISyntaxException {
             // begin from syntax
             String uri = SYNTAX;
@@ -290,7 +311,7 @@ public class CustomEndpointUriFactoryTest extends ContextTestSupport {
             uri = buildPathParameter(SYNTAX, uri, "path", null, false, properties);
             uri = buildPathParameter(SYNTAX, uri, "port", 8080, false, properties);
             // append remainder parameters
-            uri = buildQueryParameters(uri, properties);
+            uri = buildQueryParameters(uri, properties, encode);
 
             return uri;
         }
@@ -322,13 +343,13 @@ public class CustomEndpointUriFactoryTest extends ContextTestSupport {
         }
 
         @Override
-        public String buildUri(String scheme, Map<String, Object> properties)
+        public String buildUri(String scheme, Map<String, Object> properties, boolean encode)
                 throws URISyntaxException {
 
             String uri = SYNTAX;
             uri = buildPathParameter(SYNTAX, uri, "destinationType", "queue", false, properties);
             uri = buildPathParameter(SYNTAX, uri, "destinationName", null, true, properties);
-            uri = buildQueryParameters(uri, properties);
+            uri = buildQueryParameters(uri, properties, encode);
 
             return uri;
         }
@@ -359,11 +380,11 @@ public class CustomEndpointUriFactoryTest extends ContextTestSupport {
         }
 
         @Override
-        public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+        public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
             String uri = SYNTAX;
             uri = buildPathParameter(SYNTAX, uri, "destinationType", "queue", false, properties);
             uri = buildPathParameter(SYNTAX, uri, "destinationName", null, true, properties);
-            uri = buildQueryParameters(uri, properties);
+            uri = buildQueryParameters(uri, properties, encode);
 
             return uri;
         }
@@ -385,4 +406,41 @@ public class CustomEndpointUriFactoryTest extends ContextTestSupport {
 
     }
 
+    private static class MyCQLAssembler extends EndpointUriFactorySupport implements EndpointUriFactory {
+        private static final String SYNTAX = "cql:host/keyspace";
+
+        @Override
+        public boolean isEnabled(String scheme) {
+            return "cql".equals(scheme);
+        }
+
+        @Override
+        public String buildUri(String scheme, Map<String, Object> properties, boolean encode)
+                throws URISyntaxException {
+
+            String uri = SYNTAX;
+            uri = buildPathParameter(SYNTAX, uri, "host", null, true, properties);
+            uri = buildPathParameter(SYNTAX, uri, "keyspace", null, true, properties);
+            uri = buildQueryParameters(uri, properties, encode);
+
+            return uri;
+        }
+
+        @Override
+        public Set<String> propertyNames() {
+            return Collections.emptySet();
+        }
+
+        @Override
+        public Set<String> secretPropertyNames() {
+            return Collections.emptySet();
+        }
+
+        @Override
+        public boolean isLenientProperties() {
+            return false;
+        }
+
+    }
+
 }
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriFactorySupport.java b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriFactorySupport.java
index bcc3811..f09c593 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriFactorySupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriFactorySupport.java
@@ -74,7 +74,7 @@ public abstract class EndpointUriFactorySupport implements CamelContextAware, En
         return uri;
     }
 
-    protected String buildQueryParameters(String uri, Map<String, Object> parameters)
+    protected String buildQueryParameters(String uri, Map<String, Object> parameters, boolean encode)
             throws URISyntaxException {
         // we want sorted parameters
         Map<String, Object> map = new TreeMap<>(parameters);
@@ -88,7 +88,7 @@ public abstract class EndpointUriFactorySupport implements CamelContextAware, En
             }
         }
 
-        String query = URISupport.createQueryString(map);
+        String query = URISupport.createQueryString(map, encode);
         if (ObjectHelper.isNotEmpty(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)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
index 228dcd32..b1f2662 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
@@ -81,7 +81,7 @@ public final class EndpointUriFactoryGenerator {
         w.write("    }\n");
         w.write("\n");
         w.write("    @Override\n");
-        w.write("    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {\n");
+        w.write("    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {\n");
         w.write("        String syntax = scheme + BASE;\n");
         w.write("        String uri = syntax;\n");
         w.write("\n");
@@ -91,7 +91,7 @@ public final class EndpointUriFactoryGenerator {
             w.write("        uri = buildPathParameter(syntax, uri, \"" + option.getName() + "\", "
                     + defaultValue(option) + ", " + option.isRequired() + ", copy);\n");
         }
-        w.write("        uri = buildQueryParameters(uri, copy);\n");
+        w.write("        uri = buildQueryParameters(uri, copy, encode);\n");
         w.write("        return uri;\n");
         w.write("    }\n");
         w.write("\n");


[camel] 02/02: CAMEL-15722: Regen

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

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

commit 4a5c4b8f6ea677464e5f6a378b15e7c43c3f8496
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Wed Oct 21 14:39:07 2020 +0200

    CAMEL-15722: Regen
---
 .../apache/camel/component/activemq/ActiveMQEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/ahc/ws/WsEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/ahc/AhcEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/amqp/AMQPEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/apns/ApnsEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/arangodb/ArangoDbEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/as2/AS2EndpointUriFactory.java    | 4 ++--
 .../apache/camel/component/asterisk/AsteriskEndpointUriFactory.java   | 4 ++--
 .../apache/camel/component/atlasmap/AtlasMapEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/atmos/AtmosEndpointUriFactory.java     | 4 ++--
 .../component/atmosphere/websocket/WebsocketEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/atom/AtomEndpointUriFactory.java  | 4 ++--
 .../component/atomix/client/map/AtomixMapEndpointUriFactory.java      | 4 ++--
 .../atomix/client/messaging/AtomixMessagingEndpointUriFactory.java    | 4 ++--
 .../atomix/client/multimap/AtomixMultiMapEndpointUriFactory.java      | 4 ++--
 .../component/atomix/client/queue/AtomixQueueEndpointUriFactory.java  | 4 ++--
 .../component/atomix/client/set/AtomixSetEndpointUriFactory.java      | 4 ++--
 .../component/atomix/client/value/AtomixValueEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/avro/AvroEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/aws/cw/CwEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/aws/ddb/DdbEndpointUriFactory.java     | 4 ++--
 .../camel/component/aws/ddbstream/DdbStreamEndpointUriFactory.java    | 4 ++--
 .../org/apache/camel/component/aws/ec2/EC2EndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/aws/ecs/ECSEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/aws/eks/EKSEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/aws/iam/IAMEndpointUriFactory.java     | 4 ++--
 .../component/aws/firehose/KinesisFirehoseEndpointUriFactory.java     | 4 ++--
 .../apache/camel/component/aws/kinesis/KinesisEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/aws/kms/KMSEndpointUriFactory.java     | 4 ++--
 .../apache/camel/component/aws/lambda/LambdaEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/aws/mq/MQEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/aws/msk/MSKEndpointUriFactory.java     | 4 ++--
 .../java/org/apache/camel/component/aws/s3/S3EndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/aws/sdb/SdbEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/aws/ses/SesEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/aws/sns/SnsEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/aws/sqs/SqsEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/aws/swf/SWFEndpointUriFactory.java     | 4 ++--
 .../camel/component/aws/translate/TranslateEndpointUriFactory.java    | 4 ++--
 .../apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/aws2/ddb/Ddb2EndpointUriFactory.java   | 4 ++--
 .../camel/component/aws2/ddbstream/Ddb2StreamEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/aws2/ec2/AWS2EC2EndpointUriFactory.java    | 4 ++--
 .../org/apache/camel/component/aws2/ecs/ECS2EndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/aws2/eks/EKS2EndpointUriFactory.java   | 4 ++--
 .../component/aws2/eventbridge/EventbridgeEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/aws2/iam/IAM2EndpointUriFactory.java   | 4 ++--
 .../component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java   | 4 ++--
 .../camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/aws2/kms/KMS2EndpointUriFactory.java   | 4 ++--
 .../apache/camel/component/aws2/lambda/Lambda2EndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/aws2/mq/MQ2EndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/aws2/msk/MSK2EndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/aws2/ses/Ses2EndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/aws2/sqs/Sqs2EndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/aws2/sts/STS2EndpointUriFactory.java   | 4 ++--
 .../camel/component/aws2/translate/Translate2EndpointUriFactory.java  | 4 ++--
 .../camel/component/azure/eventhubs/EventHubsEndpointUriFactory.java  | 4 ++--
 .../camel/component/azure/storage/blob/BlobEndpointUriFactory.java    | 4 ++--
 .../camel/component/azure/storage/queue/QueueEndpointUriFactory.java  | 4 ++--
 .../camel/component/azure/blob/BlobServiceEndpointUriFactory.java     | 4 ++--
 .../camel/component/azure/queue/QueueServiceEndpointUriFactory.java   | 4 ++--
 .../component/bean/validator/BeanValidatorEndpointUriFactory.java     | 4 ++--
 .../java/org/apache/camel/component/bean/BeanEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/beanclass/ClassEndpointUriFactory.java | 4 ++--
 .../apache/camel/component/beanstalk/BeanstalkEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/bonita/BonitaEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/box/BoxEndpointUriFactory.java    | 4 ++--
 .../apache/camel/component/braintree/BraintreeEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/browse/BrowseEndpointUriFactory.java   | 4 ++--
 .../component/caffeine/cache/CaffeineCacheEndpointUriFactory.java     | 4 ++--
 .../component/caffeine/load/CaffeineLoadCacheEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/cassandra/CassandraEndpointUriFactory.java | 4 ++--
 .../camel/component/chatscript/ChatScriptEndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/chunk/ChunkEndpointUriFactory.java     | 4 ++--
 .../java/org/apache/camel/component/cm/CMEndpointUriFactory.java      | 4 ++--
 .../java/org/apache/camel/component/cmis/CMISEndpointUriFactory.java  | 4 ++--
 .../generated/java/org/apache/camel/coap/CoAPEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/cometd/CometdEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/consul/ConsulEndpointUriFactory.java   | 4 ++--
 .../camel/component/controlbus/ControlBusEndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/corda/CordaEndpointUriFactory.java     | 4 ++--
 .../apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/couchdb/CouchDbEndpointUriFactory.java | 4 ++--
 .../java/org/apache/camel/component/cron/CronEndpointUriFactory.java  | 4 ++--
 .../camel/component/crypto/cms/CryptoCmsEndpointUriFactory.java       | 4 ++--
 .../camel/component/crypto/DigitalSignatureEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/cxf/CxfEndpointUriFactory.java    | 4 ++--
 .../org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriFactory.java | 4 ++--
 .../camel/component/dataformat/DataFormatEndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/dataset/DataSetEndpointUriFactory.java | 4 ++--
 .../apache/camel/component/dataset/DataSetTestEndpointUriFactory.java | 4 ++--
 .../camel/component/debezium/DebeziumMongodbEndpointUriFactory.java   | 4 ++--
 .../camel/component/debezium/DebeziumMySqlEndpointUriFactory.java     | 4 ++--
 .../camel/component/debezium/DebeziumPostgresEndpointUriFactory.java  | 4 ++--
 .../camel/component/debezium/DebeziumSqlserverEndpointUriFactory.java | 4 ++--
 .../camel/component/digitalocean/DigitalOceanEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/direct/DirectEndpointUriFactory.java   | 4 ++--
 .../apache/camel/component/directvm/DirectVmEndpointUriFactory.java   | 4 ++--
 .../apache/camel/component/disruptor/DisruptorEndpointUriFactory.java | 4 ++--
 .../camel/component/disruptor/vm/DisruptorVmEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/djl/DJLEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/dns/DnsEndpointUriFactory.java    | 4 ++--
 .../org/apache/camel/component/docker/DockerEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/dozer/DozerEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/drill/DrillEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/dropbox/DropboxEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/ehcache/EhcacheEndpointUriFactory.java | 4 ++--
 .../component/elasticsearch/ElasticsearchEndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/elsql/ElsqlEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/etcd/EtcdKeysEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/etcd/EtcdStatsEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/etcd/EtcdWatchEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/exec/ExecEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/facebook/FacebookEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/fhir/FhirEndpointUriFactory.java  | 4 ++--
 .../camel/component/file/watch/FileWatchEndpointUriFactory.java       | 4 ++--
 .../java/org/apache/camel/component/file/FileEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/flatpack/FlatpackEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/flink/FlinkEndpointUriFactory.java     | 4 ++--
 .../java/org/apache/camel/component/fop/FopEndpointUriFactory.java    | 4 ++--
 .../camel/component/freemarker/FreemarkerEndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/file/remote/FtpEndpointUriFactory.java | 4 ++--
 .../apache/camel/component/file/remote/FtpsEndpointUriFactory.java    | 4 ++--
 .../apache/camel/component/file/remote/SftpEndpointUriFactory.java    | 4 ++--
 .../org/apache/camel/component/ganglia/GangliaEndpointUriFactory.java | 4 ++--
 .../apache/camel/component/geocoder/GeoCoderEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/git/GitEndpointUriFactory.java    | 4 ++--
 .../org/apache/camel/component/github/GitHubEndpointUriFactory.java   | 4 ++--
 .../component/google/bigquery/GoogleBigQueryEndpointUriFactory.java   | 4 ++--
 .../google/bigquery/sql/GoogleBigQuerySQLEndpointUriFactory.java      | 4 ++--
 .../component/google/calendar/GoogleCalendarEndpointUriFactory.java   | 4 ++--
 .../calendar/stream/GoogleCalendarStreamEndpointUriFactory.java       | 4 ++--
 .../camel/component/google/drive/GoogleDriveEndpointUriFactory.java   | 4 ++--
 .../camel/component/google/mail/GoogleMailEndpointUriFactory.java     | 4 ++--
 .../google/mail/stream/GoogleMailStreamEndpointUriFactory.java        | 4 ++--
 .../camel/component/google/pubsub/GooglePubsubEndpointUriFactory.java | 4 ++--
 .../camel/component/google/sheets/GoogleSheetsEndpointUriFactory.java | 4 ++--
 .../google/sheets/stream/GoogleSheetsStreamEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/gora/GoraEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/grape/GrapeEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/graphql/GraphqlEndpointUriFactory.java | 4 ++--
 .../java/org/apache/camel/component/grpc/GrpcEndpointUriFactory.java  | 4 ++--
 .../component/guava/eventbus/GuavaEventBusEndpointUriFactory.java     | 4 ++--
 .../atomicnumber/HazelcastAtomicnumberEndpointUriFactory.java         | 4 ++--
 .../hazelcast/instance/HazelcastInstanceEndpointUriFactory.java       | 4 ++--
 .../component/hazelcast/list/HazelcastListEndpointUriFactory.java     | 4 ++--
 .../camel/component/hazelcast/map/HazelcastMapEndpointUriFactory.java | 4 ++--
 .../hazelcast/multimap/HazelcastMultimapEndpointUriFactory.java       | 4 ++--
 .../component/hazelcast/queue/HazelcastQueueEndpointUriFactory.java   | 4 ++--
 .../replicatedmap/HazelcastReplicatedmapEndpointUriFactory.java       | 4 ++--
 .../hazelcast/ringbuffer/HazelcastRingbufferEndpointUriFactory.java   | 4 ++--
 .../component/hazelcast/seda/HazelcastSedaEndpointUriFactory.java     | 4 ++--
 .../camel/component/hazelcast/set/HazelcastSetEndpointUriFactory.java | 4 ++--
 .../component/hazelcast/topic/HazelcastTopicEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/hbase/HBaseEndpointUriFactory.java     | 4 ++--
 .../java/org/apache/camel/component/hdfs/HdfsEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/http/HttpEndpointUriFactory.java  | 4 ++--
 .../camel/component/iec60870/client/ClientEndpointUriFactory.java     | 4 ++--
 .../camel/component/iec60870/server/ServerEndpointUriFactory.java     | 4 ++--
 .../camel/component/infinispan/InfinispanEndpointUriFactory.java      | 4 ++--
 .../apache/camel/component/influxdb/InfluxDbEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/iota/IOTAEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/ipfs/IPFSEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/irc/IrcEndpointUriFactory.java    | 4 ++--
 .../org/apache/camel/component/ironmq/IronMQEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/jbpm/JBPMEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/jcache/JCacheEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/jclouds/JcloudsEndpointUriFactory.java | 4 ++--
 .../java/org/apache/camel/component/jcr/JcrEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/jdbc/JdbcEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/jetty9/JettyHttp9EndpointUriFactory.java   | 4 ++--
 .../camel/component/jgroups/raft/JGroupsRaftEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/jgroups/JGroupsEndpointUriFactory.java | 4 ++--
 .../apache/camel/component/validator/jing/JingEndpointUriFactory.java | 4 ++--
 .../java/org/apache/camel/component/jira/JiraEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/jms/JmsEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/jmx/JMXEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/jolt/JoltEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/jooq/JooqEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/jpa/JpaEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/scp/ScpEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/jslt/JsltEndpointUriFactory.java  | 4 ++--
 .../component/jsonvalidator/JsonValidatorEndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/jsonata/JsonataEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/jt400/Jt400EndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/kafka/KafkaEndpointUriFactory.java     | 4 ++--
 .../config_maps/KubernetesConfigMapsEndpointUriFactory.java           | 4 ++--
 .../deployments/KubernetesDeploymentsEndpointUriFactory.java          | 4 ++--
 .../component/kubernetes/hpa/KubernetesHPAEndpointUriFactory.java     | 4 ++--
 .../component/kubernetes/job/KubernetesJobEndpointUriFactory.java     | 4 ++--
 .../kubernetes/namespaces/KubernetesNamespacesEndpointUriFactory.java | 4 ++--
 .../component/kubernetes/nodes/KubernetesNodesEndpointUriFactory.java | 4 ++--
 .../KubernetesPersistentVolumesEndpointUriFactory.java                | 4 ++--
 .../KubernetesPersistentVolumesClaimsEndpointUriFactory.java          | 4 ++--
 .../component/kubernetes/pods/KubernetesPodsEndpointUriFactory.java   | 4 ++--
 .../KubernetesReplicationControllersEndpointUriFactory.java           | 4 ++--
 .../resources_quota/KubernetesResourcesQuotaEndpointUriFactory.java   | 4 ++--
 .../kubernetes/secrets/KubernetesSecretsEndpointUriFactory.java       | 4 ++--
 .../service_accounts/KubernetesServiceAccountsEndpointUriFactory.java | 4 ++--
 .../kubernetes/services/KubernetesServicesEndpointUriFactory.java     | 4 ++--
 .../build_configs/OpenshiftBuildConfigsEndpointUriFactory.java        | 4 ++--
 .../component/openshift/builds/OpenshiftBuildsEndpointUriFactory.java | 4 ++--
 .../java/org/apache/camel/component/kudu/KuduEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/language/LanguageEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/ldap/LdapEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/ldif/LdifEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/log/LogEndpointUriFactory.java    | 4 ++--
 .../org/apache/camel/component/lucene/LuceneEndpointUriFactory.java   | 4 ++--
 .../camel/component/lumberjack/LumberjackEndpointUriFactory.java      | 4 ++--
 .../java/org/apache/camel/component/mail/MailEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/master/MasterEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/metrics/MetricsEndpointUriFactory.java | 4 ++--
 .../camel/component/micrometer/MicrometerEndpointUriFactory.java      | 4 ++--
 .../microprofile/metrics/MicroProfileMetricsEndpointUriFactory.java   | 4 ++--
 .../camel/component/milo/client/MiloClientEndpointUriFactory.java     | 4 ++--
 .../camel/component/milo/server/MiloServerEndpointUriFactory.java     | 4 ++--
 .../java/org/apache/camel/component/mina/MinaEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/minio/MinioEndpointUriFactory.java     | 4 ++--
 .../java/org/apache/camel/component/mllp/MllpEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/mock/MockEndpointUriFactory.java  | 4 ++--
 .../camel/component/mongodb/gridfs/GridFsEndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/mongodb/MongoDbEndpointUriFactory.java | 4 ++--
 .../apache/camel/component/validator/msv/MsvEndpointUriFactory.java   | 4 ++--
 .../apache/camel/component/mustache/MustacheEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/mvel/MvelEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/mybatis/MyBatisBeanEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/mybatis/MyBatisEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/nagios/NagiosEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/nats/NatsEndpointUriFactory.java  | 4 ++--
 .../camel/component/netty/http/NettyHttpEndpointUriFactory.java       | 4 ++--
 .../org/apache/camel/component/netty/NettyEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/nitrite/NitriteEndpointUriFactory.java | 4 ++--
 .../java/org/apache/camel/component/nsq/NsqEndpointUriFactory.java    | 4 ++--
 .../org/apache/camel/oaipmh/component/OAIPMHEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/olingo2/Olingo2EndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/olingo4/Olingo4EndpointUriFactory.java | 4 ++--
 .../camel/component/openstack/cinder/CinderEndpointUriFactory.java    | 4 ++--
 .../camel/component/openstack/glance/GlanceEndpointUriFactory.java    | 4 ++--
 .../component/openstack/keystone/KeystoneEndpointUriFactory.java      | 4 ++--
 .../camel/component/openstack/neutron/NeutronEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/openstack/nova/NovaEndpointUriFactory.java | 4 ++--
 .../camel/component/openstack/swift/SwiftEndpointUriFactory.java      | 4 ++--
 .../camel/component/optaplanner/OptaPlannerEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/paho/PahoEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/pdf/PdfEndpointUriFactory.java    | 4 ++--
 .../pg/replication/slot/PgReplicationSlotEndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/pgevent/PgEventEndpointUriFactory.java | 4 ++--
 .../camel/component/platform/http/PlatformHttpEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/printer/PrinterEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/pubnub/PubNubEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/pulsar/PulsarEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/quartz/QuartzEndpointUriFactory.java   | 4 ++--
 .../apache/camel/component/quickfixj/QuickfixjEndpointUriFactory.java | 4 ++--
 .../apache/camel/component/rabbitmq/RabbitMQEndpointUriFactory.java   | 4 ++--
 .../component/reactive/streams/ReactiveStreamsEndpointUriFactory.java | 4 ++--
 .../java/org/apache/camel/component/ref/RefEndpointUriFactory.java    | 4 ++--
 .../camel/component/rest/openapi/RestOpenApiEndpointUriFactory.java   | 4 ++--
 .../camel/component/rest/swagger/RestSwaggerEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/rest/RestApiEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/rest/RestEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/resteasy/ResteasyEndpointUriFactory.java   | 4 ++--
 .../component/robotframework/RobotFrameworkEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/rss/RssEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/saga/SagaEndpointUriFactory.java  | 4 ++--
 .../camel/component/salesforce/SalesforceEndpointUriFactory.java      | 4 ++--
 .../camel/component/sap/netweaver/NetWeaverEndpointUriFactory.java    | 4 ++--
 .../org/apache/camel/component/xquery/XQueryEndpointUriFactory.java   | 4 ++--
 .../apache/camel/component/scheduler/SchedulerEndpointUriFactory.java | 4 ++--
 .../camel/component/schematron/SchematronEndpointUriFactory.java      | 4 ++--
 .../java/org/apache/camel/component/seda/SedaEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/service/ServiceEndpointUriFactory.java | 4 ++--
 .../camel/component/servicenow/ServiceNowEndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/servlet/ServletEndpointUriFactory.java | 4 ++--
 .../java/org/apache/camel/component/sip/SipEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java  | 4 ++--
 .../camel/component/sjms/batch/SjmsBatchEndpointUriFactory.java       | 4 ++--
 .../org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/slack/SlackEndpointUriFactory.java     | 4 ++--
 .../java/org/apache/camel/component/smpp/SmppEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/snmp/SnmpEndpointUriFactory.java  | 4 ++--
 .../java/org/apache/camel/component/solr/SolrEndpointUriFactory.java  | 4 ++--
 .../component/soroushbot/component/SoroushBotEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/spark/SparkEndpointUriFactory.java     | 4 ++--
 .../apache/camel/component/splunkhec/SplunkHECEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/splunk/SplunkEndpointUriFactory.java   | 4 ++--
 .../camel/component/spring/batch/SpringBatchEndpointUriFactory.java   | 4 ++--
 .../spring/integration/SpringIntegrationEndpointUriFactory.java       | 4 ++--
 .../camel/component/springldap/SpringLdapEndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/redis/RedisEndpointUriFactory.java     | 4 ++--
 .../camel/component/spring/ws/SpringWebserviceEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/event/EventEndpointUriFactory.java     | 4 ++--
 .../java/org/apache/camel/component/sql/SqlEndpointUriFactory.java    | 4 ++--
 .../camel/component/sql/stored/SqlStoredEndpointUriFactory.java       | 4 ++--
 .../java/org/apache/camel/component/ssh/SshEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/stax/StAXEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/stomp/StompEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/stream/StreamEndpointUriFactory.java   | 4 ++--
 .../component/stringtemplate/StringTemplateEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/stub/StubEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/telegram/TelegramEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/thrift/ThriftEndpointUriFactory.java   | 4 ++--
 .../java/org/apache/camel/component/tika/TikaEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/timer/TimerEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/twilio/TwilioEndpointUriFactory.java   | 4 ++--
 .../twitter/directmessage/TwitterDirectMessageEndpointUriFactory.java | 4 ++--
 .../component/twitter/search/TwitterSearchEndpointUriFactory.java     | 4 ++--
 .../component/twitter/timeline/TwitterTimelineEndpointUriFactory.java | 4 ++--
 .../apache/camel/component/undertow/UndertowEndpointUriFactory.java   | 4 ++--
 .../apache/camel/component/validator/ValidatorEndpointUriFactory.java | 4 ++--
 .../apache/camel/component/velocity/VelocityEndpointUriFactory.java   | 4 ++--
 .../camel/component/vertx/http/VertxHttpEndpointUriFactory.java       | 4 ++--
 .../component/vertx/websocket/VertxWebsocketEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/vertx/VertxEndpointUriFactory.java     | 4 ++--
 .../java/org/apache/camel/component/vm/VmEndpointUriFactory.java      | 4 ++--
 .../org/apache/camel/component/weather/WeatherEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/web3j/Web3jEndpointUriFactory.java     | 4 ++--
 .../org/apache/camel/component/webhook/WebhookEndpointUriFactory.java | 4 ++--
 .../camel/websocket/jsr356/JSR356WebSocketEndpointUriFactory.java     | 4 ++--
 .../apache/camel/component/websocket/WebsocketEndpointUriFactory.java | 4 ++--
 .../java/org/apache/camel/component/weka/WekaEndpointUriFactory.java  | 4 ++--
 .../apache/camel/component/wordpress/WordpressEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/workday/WorkdayEndpointUriFactory.java | 4 ++--
 .../org/apache/camel/component/xchange/XChangeEndpointUriFactory.java | 4 ++--
 .../java/org/apache/camel/component/xj/XJEndpointUriFactory.java      | 4 ++--
 .../camel/component/xmlsecurity/XmlSignerEndpointUriFactory.java      | 4 ++--
 .../camel/component/xmlsecurity/XmlVerifierEndpointUriFactory.java    | 4 ++--
 .../java/org/apache/camel/component/xmpp/XmppEndpointUriFactory.java  | 4 ++--
 .../camel/component/xslt/saxon/XsltSaxonEndpointUriFactory.java       | 4 ++--
 .../java/org/apache/camel/component/xslt/XsltEndpointUriFactory.java  | 4 ++--
 .../org/apache/camel/component/yammer/YammerEndpointUriFactory.java   | 4 ++--
 .../org/apache/camel/component/zendesk/ZendeskEndpointUriFactory.java | 4 ++--
 .../camel/component/zookeepermaster/MasterEndpointUriFactory.java     | 4 ++--
 .../apache/camel/component/zookeeper/ZooKeeperEndpointUriFactory.java | 4 ++--
 337 files changed, 674 insertions(+), 674 deletions(-)

diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriFactory.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriFactory.java
index c131c81..b90ee7b 100644
--- a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriFactory.java
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriFactory.java
@@ -131,7 +131,7 @@ public class ActiveMQEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -139,7 +139,7 @@ public class ActiveMQEndpointUriFactory extends org.apache.camel.support.compone
 
         uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
         uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriFactory.java b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriFactory.java
index 06aae6b..805e790 100644
--- a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriFactory.java
+++ b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriFactory.java
@@ -58,14 +58,14 @@ public class WsEndpointUriFactory extends org.apache.camel.support.component.End
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriFactory.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriFactory.java
index 52082a6..4089d86 100644
--- a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriFactory.java
+++ b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class AhcEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriFactory.java b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriFactory.java
index 202c4d3..3a3d0ae 100644
--- a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriFactory.java
+++ b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriFactory.java
@@ -131,7 +131,7 @@ public class AMQPEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -139,7 +139,7 @@ public class AMQPEndpointUriFactory extends org.apache.camel.support.component.E
 
         uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
         uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriFactory.java b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriFactory.java
index 258d906..67def9f 100644
--- a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriFactory.java
+++ b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriFactory.java
@@ -55,14 +55,14 @@ public class ApnsEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriFactory.java b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriFactory.java
index 0d8a765..686101f 100644
--- a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriFactory.java
+++ b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class ArangoDbEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "database", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriFactory.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriFactory.java
index 3d3bdc3..1f00dc5 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriFactory.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriFactory.java
@@ -68,7 +68,7 @@ public class AS2EndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -76,7 +76,7 @@ public class AS2EndpointUriFactory extends org.apache.camel.support.component.En
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriFactory.java b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriFactory.java
index 2266607..1433dab 100644
--- a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriFactory.java
+++ b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriFactory.java
@@ -45,14 +45,14 @@ public class AsteriskEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointUriFactory.java b/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointUriFactory.java
index f1e30b7..919a4ac 100644
--- a/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointUriFactory.java
+++ b/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class AtlasMapEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriFactory.java b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriFactory.java
index bc8f3ee..ab5b3ad 100644
--- a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriFactory.java
+++ b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriFactory.java
@@ -50,7 +50,7 @@ public class AtmosEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -58,7 +58,7 @@ public class AtmosEndpointUriFactory extends org.apache.camel.support.component.
 
         uri = buildPathParameter(syntax, uri, "name", null, false, copy);
         uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriFactory.java b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriFactory.java
index a3d2dee..9394244 100644
--- a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriFactory.java
+++ b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriFactory.java
@@ -60,14 +60,14 @@ public class WebsocketEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "servicePath", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriFactory.java b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriFactory.java
index 929ece9..d64c09b 100644
--- a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriFactory.java
+++ b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriFactory.java
@@ -61,14 +61,14 @@ public class AtomEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "feedUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriFactory.java
index 2e3f9de..18fb2fd 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriFactory.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriFactory.java
@@ -52,14 +52,14 @@ public class AtomixMapEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriFactory.java
index 0b40940..1324b78 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriFactory.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriFactory.java
@@ -53,14 +53,14 @@ public class AtomixMessagingEndpointUriFactory extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriFactory.java
index 1c445b5..b790e14 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriFactory.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriFactory.java
@@ -49,14 +49,14 @@ public class AtomixMultiMapEndpointUriFactory extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriFactory.java
index ba4d3b3..1605057 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriFactory.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriFactory.java
@@ -50,14 +50,14 @@ public class AtomixQueueEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriFactory.java
index 818fe07..4f20e2d6 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriFactory.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriFactory.java
@@ -51,14 +51,14 @@ public class AtomixSetEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriFactory.java
index ce86ad9..8160db2 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriFactory.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriFactory.java
@@ -51,14 +51,14 @@ public class AtomixValueEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriFactory.java b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriFactory.java
index 04e8784..22aa3fa 100644
--- a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriFactory.java
+++ b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriFactory.java
@@ -47,7 +47,7 @@ public class AvroEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -57,7 +57,7 @@ public class AvroEndpointUriFactory extends org.apache.camel.support.component.E
         uri = buildPathParameter(syntax, uri, "port", null, true, copy);
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "messageName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriFactory.java b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriFactory.java
index a02767a..f59af73 100644
--- a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriFactory.java
+++ b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriFactory.java
@@ -50,14 +50,14 @@ public class CwEndpointUriFactory extends org.apache.camel.support.component.End
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriFactory.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriFactory.java
index 6b1912c..b38566b 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriFactory.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriFactory.java
@@ -52,14 +52,14 @@ public class DdbEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriFactory.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriFactory.java
index 5957739..ade515e 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriFactory.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class DdbStreamEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriFactory.java b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriFactory.java
index ffd736d..8437afa 100644
--- a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriFactory.java
+++ b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriFactory.java
@@ -47,14 +47,14 @@ public class EC2EndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriFactory.java b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriFactory.java
index c3f24f0..9d4f8af 100644
--- a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriFactory.java
+++ b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class ECSEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriFactory.java b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriFactory.java
index 20b84cb..9a8ee88 100644
--- a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriFactory.java
+++ b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class EKSEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriFactory.java b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriFactory.java
index 2697215..69077a6 100644
--- a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriFactory.java
+++ b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class IAMEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriFactory.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriFactory.java
index dfe3639..eef25b1 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriFactory.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriFactory.java
@@ -46,14 +46,14 @@ public class KinesisFirehoseEndpointUriFactory extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriFactory.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriFactory.java
index ea27aa0..b4f4857 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriFactory.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriFactory.java
@@ -70,14 +70,14 @@ public class KinesisEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriFactory.java b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriFactory.java
index 8d9b7a1..ae32667c 100644
--- a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriFactory.java
+++ b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class KMSEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriFactory.java b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriFactory.java
index 91ad6b5..dfcb60d 100644
--- a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriFactory.java
+++ b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class LambdaEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "function", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriFactory.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriFactory.java
index c9a3e00..95cc0d9 100644
--- a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriFactory.java
+++ b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class MQEndpointUriFactory extends org.apache.camel.support.component.End
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriFactory.java b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriFactory.java
index f5fc3aa..0d474a8 100644
--- a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriFactory.java
+++ b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class MSKEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriFactory.java b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriFactory.java
index bd0c949..4feda29 100644
--- a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriFactory.java
+++ b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriFactory.java
@@ -94,14 +94,14 @@ public class S3EndpointUriFactory extends org.apache.camel.support.component.End
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "bucketNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriFactory.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriFactory.java
index c97fef3..a9cb9cd 100644
--- a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriFactory.java
+++ b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriFactory.java
@@ -45,14 +45,14 @@ public class SdbEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "domainName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriFactory.java b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriFactory.java
index 9f8801b..a9855a4 100644
--- a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriFactory.java
+++ b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriFactory.java
@@ -50,14 +50,14 @@ public class SesEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "from", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriFactory.java b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriFactory.java
index 1f4681a..2a5a855 100644
--- a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriFactory.java
+++ b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriFactory.java
@@ -56,14 +56,14 @@ public class SnsEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "topicNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriFactory.java b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriFactory.java
index dcc44b6..aac3584 100644
--- a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriFactory.java
+++ b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriFactory.java
@@ -95,14 +95,14 @@ public class SqsEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "queueNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriFactory.java b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriFactory.java
index 6f9cbe4..649e439 100644
--- a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriFactory.java
+++ b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class SWFEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriFactory.java b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriFactory.java
index 6295182..67db794 100644
--- a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriFactory.java
+++ b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriFactory.java
@@ -50,14 +50,14 @@ public class TranslateEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java
index e0f4c87..04cce1f 100644
--- a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java
+++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java
@@ -65,14 +65,14 @@ public class Athena2EndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java
index d1222ba..d898108 100644
--- a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java
+++ b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java
@@ -51,14 +51,14 @@ public class Cw2EndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriFactory.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriFactory.java
index fc31e6e..81b871f 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriFactory.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriFactory.java
@@ -53,14 +53,14 @@ public class Ddb2EndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriFactory.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriFactory.java
index c49ca86..a75dca0 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriFactory.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriFactory.java
@@ -68,14 +68,14 @@ public class Ddb2StreamEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriFactory.java b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriFactory.java
index 6bba386..5ca55cc 100644
--- a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriFactory.java
+++ b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriFactory.java
@@ -49,14 +49,14 @@ public class AWS2EC2EndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriFactory.java b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriFactory.java
index 8f1f30e..12ca788 100644
--- a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriFactory.java
+++ b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriFactory.java
@@ -49,14 +49,14 @@ public class ECS2EndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriFactory.java b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriFactory.java
index 17ef4db..ad6a278 100644
--- a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriFactory.java
+++ b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriFactory.java
@@ -49,14 +49,14 @@ public class EKS2EndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriFactory.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriFactory.java
index 24c1f40..d52c879 100644
--- a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriFactory.java
+++ b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriFactory.java
@@ -50,14 +50,14 @@ public class EventbridgeEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "eventbusNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriFactory.java b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriFactory.java
index 45b422a..75e68f8 100644
--- a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriFactory.java
+++ b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriFactory.java
@@ -49,14 +49,14 @@ public class IAM2EndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java
index cf53300..79c1c96 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java
@@ -49,14 +49,14 @@ public class KinesisFirehose2EndpointUriFactory extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java
index 748a6b3..a0f2af7 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java
@@ -72,14 +72,14 @@ public class Kinesis2EndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriFactory.java b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriFactory.java
index b509dd9..6ce28b6 100644
--- a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriFactory.java
+++ b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriFactory.java
@@ -49,14 +49,14 @@ public class KMS2EndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriFactory.java b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriFactory.java
index ec72c41..2698283 100644
--- a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriFactory.java
+++ b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriFactory.java
@@ -49,14 +49,14 @@ public class Lambda2EndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "function", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriFactory.java b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriFactory.java
index eb4fc4b..9d20d29 100644
--- a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriFactory.java
+++ b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriFactory.java
@@ -49,14 +49,14 @@ public class MQ2EndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriFactory.java b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriFactory.java
index c64f035..71e799e 100644
--- a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriFactory.java
+++ b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriFactory.java
@@ -49,14 +49,14 @@ public class MSK2EndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java
index 7071391..0827685 100644
--- a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java
+++ b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java
@@ -97,14 +97,14 @@ public class AWS2S3EndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "bucketNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriFactory.java b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriFactory.java
index c870e7a..8580425 100644
--- a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriFactory.java
+++ b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriFactory.java
@@ -51,14 +51,14 @@ public class Ses2EndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "from", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java
index 2859dcd..f830ab7 100644
--- a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java
@@ -56,14 +56,14 @@ public class Sns2EndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "topicNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriFactory.java b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriFactory.java
index 89eaad4..a18280f 100644
--- a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriFactory.java
+++ b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriFactory.java
@@ -96,14 +96,14 @@ public class Sqs2EndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "queueNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriFactory.java b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriFactory.java
index f76ec86..d1e87aa 100644
--- a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriFactory.java
+++ b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriFactory.java
@@ -49,14 +49,14 @@ public class STS2EndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriFactory.java b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriFactory.java
index 403a2fd..3d36b96 100644
--- a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriFactory.java
+++ b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriFactory.java
@@ -52,14 +52,14 @@ public class Translate2EndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriFactory.java b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriFactory.java
index 06f1b9f..1cd88c3 100644
--- a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriFactory.java
+++ b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriFactory.java
@@ -61,7 +61,7 @@ public class EventHubsEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -69,7 +69,7 @@ public class EventHubsEndpointUriFactory extends org.apache.camel.support.compon
 
         uri = buildPathParameter(syntax, uri, "namespace", null, false, copy);
         uri = buildPathParameter(syntax, uri, "eventHubName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriFactory.java b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriFactory.java
index 7b488a7..b685e23 100644
--- a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriFactory.java
+++ b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriFactory.java
@@ -66,7 +66,7 @@ public class BlobEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -74,7 +74,7 @@ public class BlobEndpointUriFactory extends org.apache.camel.support.component.E
 
         uri = buildPathParameter(syntax, uri, "accountName", null, false, copy);
         uri = buildPathParameter(syntax, uri, "containerName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriFactory.java b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriFactory.java
index 79b1144..66b4ed4 100644
--- a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriFactory.java
+++ b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriFactory.java
@@ -53,7 +53,7 @@ public class QueueEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -61,7 +61,7 @@ public class QueueEndpointUriFactory extends org.apache.camel.support.component.
 
         uri = buildPathParameter(syntax, uri, "accountName", null, false, copy);
         uri = buildPathParameter(syntax, uri, "queueName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriFactory.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriFactory.java
index 7f9a8d1..8c70c3c 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriFactory.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriFactory.java
@@ -59,14 +59,14 @@ public class BlobServiceEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "containerOrBlobUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriFactory.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriFactory.java
index 2e1ed34..4a3a7f5 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriFactory.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriFactory.java
@@ -50,14 +50,14 @@ public class QueueServiceEndpointUriFactory extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "containerAndQueueUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriFactory.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriFactory.java
index ba94888..73db324 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriFactory.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriFactory.java
@@ -42,14 +42,14 @@ public class BeanValidatorEndpointUriFactory extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriFactory.java b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriFactory.java
index d275fc8..7b76d1c 100644
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriFactory.java
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class BeanEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriFactory.java b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriFactory.java
index ab55d39..17e86e4 100644
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriFactory.java
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class ClassEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriFactory.java b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriFactory.java
index 83da0c5..b247072 100644
--- a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriFactory.java
+++ b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriFactory.java
@@ -61,14 +61,14 @@ public class BeanstalkEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "connectionSettings", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriFactory.java b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriFactory.java
index b67cc6c..c7966f9 100644
--- a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriFactory.java
+++ b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriFactory.java
@@ -43,14 +43,14 @@ public class BonitaEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriFactory.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriFactory.java
index 8c4a109..1bbea05 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriFactory.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriFactory.java
@@ -130,7 +130,7 @@ public class BoxEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -138,7 +138,7 @@ public class BoxEndpointUriFactory extends org.apache.camel.support.component.En
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriFactory.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriFactory.java
index 5fc5786..94797df 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriFactory.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriFactory.java
@@ -81,7 +81,7 @@ public class BraintreeEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -89,7 +89,7 @@ public class BraintreeEndpointUriFactory extends org.apache.camel.support.compon
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriFactory.java b/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriFactory.java
index 5c17b35..77f0f63 100644
--- a/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriFactory.java
+++ b/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriFactory.java
@@ -38,14 +38,14 @@ public class BrowseEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriFactory.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriFactory.java
index f598589..98332ea 100644
--- a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriFactory.java
+++ b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriFactory.java
@@ -49,14 +49,14 @@ public class CaffeineCacheEndpointUriFactory extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriFactory.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriFactory.java
index 9fe701f..2291f72 100644
--- a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriFactory.java
+++ b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriFactory.java
@@ -49,14 +49,14 @@ public class CaffeineLoadCacheEndpointUriFactory extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriFactory.java b/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriFactory.java
index 45f2898..a28f4ad 100644
--- a/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriFactory.java
+++ b/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriFactory.java
@@ -67,7 +67,7 @@ public class CassandraEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -77,7 +77,7 @@ public class CassandraEndpointUriFactory extends org.apache.camel.support.compon
         uri = buildPathParameter(syntax, uri, "hosts", null, false, copy);
         uri = buildPathParameter(syntax, uri, "port", null, false, copy);
         uri = buildPathParameter(syntax, uri, "keyspace", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java b/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java
index 1ae9098..b1b0eaf 100644
--- a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java
+++ b/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java
@@ -39,7 +39,7 @@ public class ChatScriptEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -48,7 +48,7 @@ public class ChatScriptEndpointUriFactory extends org.apache.camel.support.compo
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", 1024, false, copy);
         uri = buildPathParameter(syntax, uri, "botName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriFactory.java b/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriFactory.java
index 7ea1d74..217693d 100644
--- a/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriFactory.java
+++ b/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriFactory.java
@@ -43,14 +43,14 @@ public class ChunkEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriFactory.java b/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriFactory.java
index 739729a..f987ba6 100644
--- a/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriFactory.java
+++ b/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class CMEndpointUriFactory extends org.apache.camel.support.component.End
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriFactory.java b/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriFactory.java
index 2c4172d..b92dc3d 100644
--- a/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriFactory.java
+++ b/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriFactory.java
@@ -50,14 +50,14 @@ public class CMISEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cmsUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriFactory.java b/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriFactory.java
index 0d74aea..0223a09 100644
--- a/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriFactory.java
+++ b/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriFactory.java
@@ -54,14 +54,14 @@ public class CoAPEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "uri", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriFactory.java b/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriFactory.java
index 10eef07..a8192ed 100644
--- a/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriFactory.java
+++ b/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriFactory.java
@@ -58,7 +58,7 @@ public class CometdEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -67,7 +67,7 @@ public class CometdEndpointUriFactory extends org.apache.camel.support.component
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, true, copy);
         uri = buildPathParameter(syntax, uri, "channelName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
index 5cace64..ca90091 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
@@ -66,14 +66,14 @@ public class ConsulEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "apiEndpoint", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriFactory.java b/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriFactory.java
index 2bd0a38..c13a9e2 100644
--- a/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriFactory.java
+++ b/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriFactory.java
@@ -41,7 +41,7 @@ public class ControlBusEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -49,7 +49,7 @@ public class ControlBusEndpointUriFactory extends org.apache.camel.support.compo
 
         uri = buildPathParameter(syntax, uri, "command", null, true, copy);
         uri = buildPathParameter(syntax, uri, "language", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriFactory.java b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriFactory.java
index 6685950..a9dd61b 100644
--- a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriFactory.java
+++ b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriFactory.java
@@ -51,14 +51,14 @@ public class CordaEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "node", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java
index c0017cf..47f4034 100644
--- a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java
+++ b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java
@@ -82,7 +82,7 @@ public class CouchbaseEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -91,7 +91,7 @@ public class CouchbaseEndpointUriFactory extends org.apache.camel.support.compon
         uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
         uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", 8091, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriFactory.java b/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriFactory.java
index 73faf6b..1e242b6 100644
--- a/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriFactory.java
+++ b/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriFactory.java
@@ -52,7 +52,7 @@ public class CouchDbEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -62,7 +62,7 @@ public class CouchDbEndpointUriFactory extends org.apache.camel.support.componen
         uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", 5984, false, copy);
         uri = buildPathParameter(syntax, uri, "database", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriFactory.java b/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriFactory.java
index be42244..3ba651d 100644
--- a/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriFactory.java
+++ b/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriFactory.java
@@ -38,14 +38,14 @@ public class CronEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriFactory.java b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriFactory.java
index 3093574..5a72736 100644
--- a/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriFactory.java
+++ b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriFactory.java
@@ -50,7 +50,7 @@ public class CryptoCmsEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -58,7 +58,7 @@ public class CryptoCmsEndpointUriFactory extends org.apache.camel.support.compon
 
         uri = buildPathParameter(syntax, uri, "cryptoOperation", null, true, copy);
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriFactory.java b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriFactory.java
index c5782c5..0ac5bf9 100644
--- a/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriFactory.java
+++ b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriFactory.java
@@ -59,7 +59,7 @@ public class DigitalSignatureEndpointUriFactory extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -67,7 +67,7 @@ public class DigitalSignatureEndpointUriFactory extends org.apache.camel.support
 
         uri = buildPathParameter(syntax, uri, "cryptoOperation", null, true, copy);
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriFactory.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriFactory.java
index 38c1ee6..57f4bf1 100644
--- a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriFactory.java
+++ b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriFactory.java
@@ -72,7 +72,7 @@ public class CxfEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -80,7 +80,7 @@ public class CxfEndpointUriFactory extends org.apache.camel.support.component.En
 
         uri = buildPathParameter(syntax, uri, "beanId", null, false, copy);
         uri = buildPathParameter(syntax, uri, "address", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriFactory.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriFactory.java
index 558c143..5855290 100644
--- a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriFactory.java
+++ b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriFactory.java
@@ -65,7 +65,7 @@ public class CxfRsEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -73,7 +73,7 @@ public class CxfRsEndpointUriFactory extends org.apache.camel.support.component.
 
         uri = buildPathParameter(syntax, uri, "beanId", null, false, copy);
         uri = buildPathParameter(syntax, uri, "address", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriFactory.java b/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriFactory.java
index fd07a40..664f161 100644
--- a/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriFactory.java
+++ b/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriFactory.java
@@ -36,7 +36,7 @@ public class DataFormatEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -44,7 +44,7 @@ public class DataFormatEndpointUriFactory extends org.apache.camel.support.compo
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
         uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriFactory.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriFactory.java
index 0de9a70..c0161e6 100644
--- a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriFactory.java
+++ b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriFactory.java
@@ -54,14 +54,14 @@ public class DataSetEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriFactory.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriFactory.java
index f109254..7013eea 100644
--- a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriFactory.java
+++ b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriFactory.java
@@ -49,14 +49,14 @@ public class DataSetTestEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriFactory.java b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriFactory.java
index 1488650..1571d22 100644
--- a/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriFactory.java
+++ b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriFactory.java
@@ -88,14 +88,14 @@ public class DebeziumMongodbEndpointUriFactory extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriFactory.java b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriFactory.java
index f9be422..86d6a06 100644
--- a/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriFactory.java
+++ b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriFactory.java
@@ -113,14 +113,14 @@ public class DebeziumMySqlEndpointUriFactory extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriFactory.java b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriFactory.java
index f0a721c..504e488 100644
--- a/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriFactory.java
+++ b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriFactory.java
@@ -118,14 +118,14 @@ public class DebeziumPostgresEndpointUriFactory extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriFactory.java b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriFactory.java
index 113adc6..89b4825 100644
--- a/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriFactory.java
+++ b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriFactory.java
@@ -98,14 +98,14 @@ public class DebeziumSqlserverEndpointUriFactory extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriFactory.java b/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriFactory.java
index 944ff71..8d5b7cc 100644
--- a/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriFactory.java
+++ b/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriFactory.java
@@ -48,14 +48,14 @@ public class DigitalOceanEndpointUriFactory extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "operation", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriFactory.java b/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriFactory.java
index 33ecf4e..5684c2b 100644
--- a/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriFactory.java
+++ b/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class DirectEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriFactory.java b/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriFactory.java
index 0ae51ca..9d67cb2 100644
--- a/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriFactory.java
+++ b/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriFactory.java
@@ -43,14 +43,14 @@ public class DirectVmEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriFactory.java b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriFactory.java
index d2b83e7..6eab283 100644
--- a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriFactory.java
+++ b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriFactory.java
@@ -52,14 +52,14 @@ public class DisruptorEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriFactory.java b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriFactory.java
index 71c6db4..4d4c14c 100644
--- a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriFactory.java
+++ b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriFactory.java
@@ -52,14 +52,14 @@ public class DisruptorVmEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriFactory.java b/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriFactory.java
index 7c39f1c..dc98c81 100644
--- a/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriFactory.java
+++ b/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriFactory.java
@@ -38,14 +38,14 @@ public class DJLEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "application", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriFactory.java b/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriFactory.java
index 59af9dd..ce4e066 100644
--- a/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriFactory.java
+++ b/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriFactory.java
@@ -35,14 +35,14 @@ public class DnsEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "dnsType", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriFactory.java b/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriFactory.java
index addb1c8..8ee2f36 100644
--- a/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriFactory.java
+++ b/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriFactory.java
@@ -58,14 +58,14 @@ public class DockerEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriFactory.java b/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriFactory.java
index ba18174..7a8f087 100644
--- a/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriFactory.java
+++ b/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class DozerEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriFactory.java b/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriFactory.java
index feb0a09..68cd978 100644
--- a/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriFactory.java
+++ b/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class DrillEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriFactory.java b/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriFactory.java
index 68bbcd9..102e522 100644
--- a/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriFactory.java
+++ b/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriFactory.java
@@ -46,14 +46,14 @@ public class DropboxEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriFactory.java b/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriFactory.java
index 2dea45e..b6210b9 100644
--- a/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriFactory.java
+++ b/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriFactory.java
@@ -51,14 +51,14 @@ public class EhcacheEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriFactory.java b/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriFactory.java
index 225982a..0229f58 100644
--- a/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriFactory.java
+++ b/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriFactory.java
@@ -51,14 +51,14 @@ public class ElasticsearchEndpointUriFactory extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "clusterName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriFactory.java b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriFactory.java
index e70cfb9..ec99774 100644
--- a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriFactory.java
+++ b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriFactory.java
@@ -83,7 +83,7 @@ public class ElsqlEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -91,7 +91,7 @@ public class ElsqlEndpointUriFactory extends org.apache.camel.support.component.
 
         uri = buildPathParameter(syntax, uri, "elsqlName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "resourceUri", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriFactory.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriFactory.java
index a852c5f..4b6756c 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriFactory.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriFactory.java
@@ -46,14 +46,14 @@ public class EtcdKeysEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriFactory.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriFactory.java
index 6c45e58..682d929 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriFactory.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class EtcdStatsEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriFactory.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriFactory.java
index a12b5e1..e41a5a6 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriFactory.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriFactory.java
@@ -49,14 +49,14 @@ public class EtcdWatchEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriFactory.java b/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriFactory.java
index e938a51..dfb4766 100644
--- a/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriFactory.java
+++ b/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriFactory.java
@@ -43,14 +43,14 @@ public class ExecEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "executable", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriFactory.java b/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriFactory.java
index 2ab5cbc..9d59543 100644
--- a/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriFactory.java
+++ b/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriFactory.java
@@ -140,14 +140,14 @@ public class FacebookEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriFactory.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriFactory.java
index 6813b14..10270e6 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriFactory.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriFactory.java
@@ -120,7 +120,7 @@ public class FhirEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -128,7 +128,7 @@ public class FhirEndpointUriFactory extends org.apache.camel.support.component.E
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriFactory.java b/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriFactory.java
index 11bbbe2..3d6577b 100644
--- a/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriFactory.java
+++ b/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriFactory.java
@@ -46,14 +46,14 @@ public class FileWatchEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriFactory.java b/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriFactory.java
index ef0b19c..392f0c0 100644
--- a/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriFactory.java
+++ b/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriFactory.java
@@ -124,14 +124,14 @@ public class FileEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "directoryName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriFactory.java b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriFactory.java
index 8e9414e..decc1f8 100644
--- a/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriFactory.java
+++ b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriFactory.java
@@ -61,7 +61,7 @@ public class FlatpackEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -69,7 +69,7 @@ public class FlatpackEndpointUriFactory extends org.apache.camel.support.compone
 
         uri = buildPathParameter(syntax, uri, "type", "delim", false, copy);
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriFactory.java b/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriFactory.java
index efe608e..3b94382 100644
--- a/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriFactory.java
+++ b/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriFactory.java
@@ -40,14 +40,14 @@ public class FlinkEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "endpointType", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriFactory.java b/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriFactory.java
index 26f9248..38ffefb 100644
--- a/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriFactory.java
+++ b/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriFactory.java
@@ -37,14 +37,14 @@ public class FopEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "outputType", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriFactory.java b/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriFactory.java
index cb4a9ce..48224d6 100644
--- a/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriFactory.java
+++ b/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class FreemarkerEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriFactory.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriFactory.java
index 03dca71..0c55943 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriFactory.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriFactory.java
@@ -148,7 +148,7 @@ public class FtpEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -157,7 +157,7 @@ public class FtpEndpointUriFactory extends org.apache.camel.support.component.En
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, false, copy);
         uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriFactory.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriFactory.java
index 139c291..a248832 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriFactory.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriFactory.java
@@ -156,7 +156,7 @@ public class FtpsEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -165,7 +165,7 @@ public class FtpsEndpointUriFactory extends org.apache.camel.support.component.E
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, false, copy);
         uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriFactory.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriFactory.java
index e678b6a..d3e52d7 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriFactory.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriFactory.java
@@ -166,7 +166,7 @@ public class SftpEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -175,7 +175,7 @@ public class SftpEndpointUriFactory extends org.apache.camel.support.component.E
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, false, copy);
         uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriFactory.java b/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriFactory.java
index e071282..ac74991 100644
--- a/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriFactory.java
+++ b/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriFactory.java
@@ -48,7 +48,7 @@ public class GangliaEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -56,7 +56,7 @@ public class GangliaEndpointUriFactory extends org.apache.camel.support.componen
 
         uri = buildPathParameter(syntax, uri, "host", "239.2.11.71", false, copy);
         uri = buildPathParameter(syntax, uri, "port", 8649, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriFactory.java b/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriFactory.java
index 634d847..e728d8c 100644
--- a/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriFactory.java
+++ b/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriFactory.java
@@ -54,7 +54,7 @@ public class GeoCoderEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -62,7 +62,7 @@ public class GeoCoderEndpointUriFactory extends org.apache.camel.support.compone
 
         uri = buildPathParameter(syntax, uri, "address", null, false, copy);
         uri = buildPathParameter(syntax, uri, "latlng", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriFactory.java b/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriFactory.java
index bde3f02..5b16c76 100644
--- a/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriFactory.java
+++ b/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class GitEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "localPath", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriFactory.java b/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriFactory.java
index df3c953..98bb601 100644
--- a/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriFactory.java
+++ b/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriFactory.java
@@ -47,7 +47,7 @@ public class GitHubEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -55,7 +55,7 @@ public class GitHubEndpointUriFactory extends org.apache.camel.support.component
 
         uri = buildPathParameter(syntax, uri, "type", null, true, copy);
         uri = buildPathParameter(syntax, uri, "branchName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriFactory.java b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriFactory.java
index 52476ff..82d4820 100644
--- a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriFactory.java
+++ b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriFactory.java
@@ -39,7 +39,7 @@ public class GoogleBigQueryEndpointUriFactory extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -48,7 +48,7 @@ public class GoogleBigQueryEndpointUriFactory extends org.apache.camel.support.c
         uri = buildPathParameter(syntax, uri, "projectId", null, true, copy);
         uri = buildPathParameter(syntax, uri, "datasetId", null, true, copy);
         uri = buildPathParameter(syntax, uri, "tableId", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriFactory.java b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriFactory.java
index 1bf636a..6639956 100644
--- a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriFactory.java
+++ b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriFactory.java
@@ -37,7 +37,7 @@ public class GoogleBigQuerySQLEndpointUriFactory extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -45,7 +45,7 @@ public class GoogleBigQuerySQLEndpointUriFactory extends org.apache.camel.suppor
 
         uri = buildPathParameter(syntax, uri, "query", null, true, copy);
         uri = buildPathParameter(syntax, uri, "projectId", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriFactory.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriFactory.java
index 35a1ba5..66f0e7e 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriFactory.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriFactory.java
@@ -77,7 +77,7 @@ public class GoogleCalendarEndpointUriFactory extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -85,7 +85,7 @@ public class GoogleCalendarEndpointUriFactory extends org.apache.camel.support.c
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java
index 3eadf5d..77e5fed 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriFactory.java
@@ -75,14 +75,14 @@ public class GoogleCalendarStreamEndpointUriFactory extends org.apache.camel.sup
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "index", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriFactory.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriFactory.java
index 4e3be34..de1cc3c 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriFactory.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriFactory.java
@@ -83,7 +83,7 @@ public class GoogleDriveEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -91,7 +91,7 @@ public class GoogleDriveEndpointUriFactory extends org.apache.camel.support.comp
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriFactory.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriFactory.java
index 82a5ebf..37f4f28 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriFactory.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriFactory.java
@@ -73,7 +73,7 @@ public class GoogleMailEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -81,7 +81,7 @@ public class GoogleMailEndpointUriFactory extends org.apache.camel.support.compo
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriFactory.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriFactory.java
index 8e80d4f..5623349 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriFactory.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriFactory.java
@@ -74,14 +74,14 @@ public class GoogleMailStreamEndpointUriFactory extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "index", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriFactory.java b/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriFactory.java
index d58d540..2228811 100644
--- a/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriFactory.java
+++ b/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriFactory.java
@@ -44,7 +44,7 @@ public class GooglePubsubEndpointUriFactory extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -52,7 +52,7 @@ public class GooglePubsubEndpointUriFactory extends org.apache.camel.support.com
 
         uri = buildPathParameter(syntax, uri, "projectId", null, true, copy);
         uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriFactory.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriFactory.java
index 61e18a4..bb080fa 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriFactory.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriFactory.java
@@ -77,7 +77,7 @@ public class GoogleSheetsEndpointUriFactory extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -85,7 +85,7 @@ public class GoogleSheetsEndpointUriFactory extends org.apache.camel.support.com
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriFactory.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriFactory.java
index 051c873..b859864 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriFactory.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriFactory.java
@@ -79,14 +79,14 @@ public class GoogleSheetsStreamEndpointUriFactory extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriFactory.java b/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriFactory.java
index fbaeed7..01401b8 100644
--- a/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriFactory.java
+++ b/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriFactory.java
@@ -55,14 +55,14 @@ public class GoraEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriFactory.java b/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriFactory.java
index f8bfbd3..d1c0bb2 100644
--- a/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriFactory.java
+++ b/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriFactory.java
@@ -35,14 +35,14 @@ public class GrapeEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "defaultCoordinates", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriFactory.java b/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriFactory.java
index 8d8695f..8a31268 100644
--- a/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriFactory.java
+++ b/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class GraphqlEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriFactory.java b/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriFactory.java
index d374c4e..cf340cb 100644
--- a/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriFactory.java
+++ b/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriFactory.java
@@ -64,7 +64,7 @@ public class GrpcEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -73,7 +73,7 @@ public class GrpcEndpointUriFactory extends org.apache.camel.support.component.E
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, true, copy);
         uri = buildPathParameter(syntax, uri, "service", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriFactory.java b/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriFactory.java
index fb9ba70..e01dd6d 100644
--- a/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriFactory.java
+++ b/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriFactory.java
@@ -40,14 +40,14 @@ public class GuavaEventBusEndpointUriFactory extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "eventBusRef", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriFactory.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriFactory.java
index 3791bb8..822357d 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriFactory.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriFactory.java
@@ -38,14 +38,14 @@ public class HazelcastAtomicnumberEndpointUriFactory extends org.apache.camel.su
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriFactory.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriFactory.java
index ff9c447..073f47d 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriFactory.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriFactory.java
@@ -40,14 +40,14 @@ public class HazelcastInstanceEndpointUriFactory extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriFactory.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriFactory.java
index 421622b..5b631b2 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriFactory.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class HazelcastListEndpointUriFactory extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriFactory.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriFactory.java
index 6af8e3e..6c498b2 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriFactory.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class HazelcastMapEndpointUriFactory extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriFactory.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriFactory.java
index bcd011a..4131972 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriFactory.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class HazelcastMultimapEndpointUriFactory extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriFactory.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriFactory.java
index b783c42..bf7929d 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriFactory.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriFactory.java
@@ -44,14 +44,14 @@ public class HazelcastQueueEndpointUriFactory extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriFactory.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriFactory.java
index db4c6e1..83312ab 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriFactory.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class HazelcastReplicatedmapEndpointUriFactory extends org.apache.camel.s
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriFactory.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriFactory.java
index 0a0cb8a..395faf1 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriFactory.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriFactory.java
@@ -38,14 +38,14 @@ public class HazelcastRingbufferEndpointUriFactory extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriFactory.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriFactory.java
index f52a980..73ba6d9 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriFactory.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriFactory.java
@@ -46,14 +46,14 @@ public class HazelcastSedaEndpointUriFactory extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriFactory.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriFactory.java
index 7149199..4c03bc7 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriFactory.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class HazelcastSetEndpointUriFactory extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriFactory.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriFactory.java
index 9b561f7..f71c2dd 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriFactory.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriFactory.java
@@ -42,14 +42,14 @@ public class HazelcastTopicEndpointUriFactory extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriFactory.java b/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriFactory.java
index 65d6abc..51f0319 100644
--- a/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriFactory.java
+++ b/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriFactory.java
@@ -50,14 +50,14 @@ public class HBaseEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriFactory.java b/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriFactory.java
index 9e3fff9..efc44a7 100644
--- a/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriFactory.java
+++ b/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriFactory.java
@@ -81,7 +81,7 @@ public class HdfsEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -90,7 +90,7 @@ public class HdfsEndpointUriFactory extends org.apache.camel.support.component.E
         uri = buildPathParameter(syntax, uri, "hostName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", 8020, false, copy);
         uri = buildPathParameter(syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriFactory.java b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriFactory.java
index 4a7d5ed..75110ec 100644
--- a/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriFactory.java
+++ b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriFactory.java
@@ -96,14 +96,14 @@ public class HttpEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriFactory.java b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriFactory.java
index 44b4624..78fb106 100644
--- a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriFactory.java
+++ b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriFactory.java
@@ -54,14 +54,14 @@ public class ClientEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "uriPath", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriFactory.java b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriFactory.java
index b97047e..147609b 100644
--- a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriFactory.java
+++ b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriFactory.java
@@ -55,14 +55,14 @@ public class ServerEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "uriPath", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriFactory.java b/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriFactory.java
index 3b7a445..960f740 100644
--- a/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriFactory.java
+++ b/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriFactory.java
@@ -65,14 +65,14 @@ public class InfinispanEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriFactory.java b/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriFactory.java
index bf4b536..e391b00 100644
--- a/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriFactory.java
+++ b/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriFactory.java
@@ -40,14 +40,14 @@ public class InfluxDbEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "connectionBean", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriFactory.java b/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriFactory.java
index 5072a09..e62ae70 100644
--- a/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriFactory.java
+++ b/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class IOTAEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriFactory.java b/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriFactory.java
index f3c25b4..7e5a737 100644
--- a/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriFactory.java
+++ b/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriFactory.java
@@ -36,14 +36,14 @@ public class IPFSEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "ipfsCmd", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriFactory.java b/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriFactory.java
index f8efc4e..a630844 100644
--- a/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriFactory.java
+++ b/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriFactory.java
@@ -66,7 +66,7 @@ public class IrcEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -74,7 +74,7 @@ public class IrcEndpointUriFactory extends org.apache.camel.support.component.En
 
         uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriFactory.java b/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriFactory.java
index 77bed75..c159f32 100644
--- a/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriFactory.java
+++ b/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriFactory.java
@@ -65,14 +65,14 @@ public class IronMQEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "queueName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriFactory.java b/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriFactory.java
index a088149..42ba602 100644
--- a/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriFactory.java
+++ b/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriFactory.java
@@ -68,7 +68,7 @@ public class JBPMEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -76,7 +76,7 @@ public class JBPMEndpointUriFactory extends org.apache.camel.support.component.E
 
         uri = buildPathParameter(syntax, uri, "connectionURL", null, true, copy);
         uri = buildPathParameter(syntax, uri, "eventListenerType", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriFactory.java b/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriFactory.java
index 4414fe1..99561f4 100644
--- a/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriFactory.java
+++ b/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriFactory.java
@@ -56,14 +56,14 @@ public class JCacheEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriFactory.java b/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriFactory.java
index 2633383..549fe9c 100644
--- a/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriFactory.java
+++ b/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriFactory.java
@@ -50,7 +50,7 @@ public class JcloudsEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -58,7 +58,7 @@ public class JcloudsEndpointUriFactory extends org.apache.camel.support.componen
 
         uri = buildPathParameter(syntax, uri, "command", null, true, copy);
         uri = buildPathParameter(syntax, uri, "providerId", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriFactory.java b/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriFactory.java
index 8862852..3289ec6 100644
--- a/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriFactory.java
+++ b/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriFactory.java
@@ -49,7 +49,7 @@ public class JcrEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -57,7 +57,7 @@ public class JcrEndpointUriFactory extends org.apache.camel.support.component.En
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "base", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriFactory.java b/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriFactory.java
index c09dc11..cca4337 100644
--- a/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriFactory.java
+++ b/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class JdbcEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "dataSourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriFactory.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriFactory.java
index bcb7aad..d13789e 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriFactory.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriFactory.java
@@ -66,14 +66,14 @@ public class JettyHttp9EndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriFactory.java b/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriFactory.java
index 15f86a5..1054e54 100644
--- a/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriFactory.java
+++ b/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class JGroupsRaftEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "clusterName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriFactory.java b/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriFactory.java
index c6663a9..e573c3e 100644
--- a/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriFactory.java
+++ b/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriFactory.java
@@ -40,14 +40,14 @@ public class JGroupsEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "clusterName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriFactory.java b/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriFactory.java
index 72a137e..322157b 100644
--- a/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriFactory.java
+++ b/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriFactory.java
@@ -36,14 +36,14 @@ public class JingEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriFactory.java b/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriFactory.java
index 2f7b9aa..986291e 100644
--- a/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriFactory.java
+++ b/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriFactory.java
@@ -57,14 +57,14 @@ public class JiraEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriFactory.java b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriFactory.java
index 4529ebe..2af8ab0 100644
--- a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriFactory.java
+++ b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriFactory.java
@@ -131,7 +131,7 @@ public class JmsEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -139,7 +139,7 @@ public class JmsEndpointUriFactory extends org.apache.camel.support.component.En
 
         uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
         uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriFactory.java b/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriFactory.java
index 1a0cbca..d7375ec 100644
--- a/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriFactory.java
+++ b/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriFactory.java
@@ -66,14 +66,14 @@ public class JMXEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "serverURL", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriFactory.java b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriFactory.java
index d1ab233..2d6b6df 100644
--- a/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriFactory.java
+++ b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class JoltEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriFactory.java b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriFactory.java
index 19b47e5..5cd3cdc 100644
--- a/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriFactory.java
+++ b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriFactory.java
@@ -58,14 +58,14 @@ public class JooqEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "entityType", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriFactory.java b/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriFactory.java
index 953bf4f..3c83840 100644
--- a/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriFactory.java
+++ b/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriFactory.java
@@ -78,14 +78,14 @@ public class JpaEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "entityType", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriFactory.java b/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriFactory.java
index 3c947c4..b8b1a74 100644
--- a/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriFactory.java
+++ b/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriFactory.java
@@ -66,7 +66,7 @@ public class ScpEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -75,7 +75,7 @@ public class ScpEndpointUriFactory extends org.apache.camel.support.component.En
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, false, copy);
         uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriFactory.java b/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriFactory.java
index eceaf7d..f3fb848 100644
--- a/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriFactory.java
+++ b/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class JsltEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriFactory.java b/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriFactory.java
index e12fe02..0100ff1 100644
--- a/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriFactory.java
+++ b/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriFactory.java
@@ -42,14 +42,14 @@ public class JsonValidatorEndpointUriFactory extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriFactory.java b/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriFactory.java
index 9e7ecbf..e8fa69a 100644
--- a/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriFactory.java
+++ b/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class JsonataEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriFactory.java b/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriFactory.java
index f73cdcf..569386e 100644
--- a/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriFactory.java
+++ b/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriFactory.java
@@ -73,7 +73,7 @@ public class Jt400EndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -84,7 +84,7 @@ public class Jt400EndpointUriFactory extends org.apache.camel.support.component.
         uri = buildPathParameter(syntax, uri, "systemName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "objectPath", null, true, copy);
         uri = buildPathParameter(syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriFactory.java b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriFactory.java
index a066f5e..21614f1 100644
--- a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriFactory.java
+++ b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriFactory.java
@@ -134,14 +134,14 @@ public class KafkaEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriFactory.java
index 48ac45f..44d5c69 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class KubernetesConfigMapsEndpointUriFactory extends org.apache.camel.sup
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriFactory.java
index d3cb5e6..acb0665 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriFactory.java
@@ -75,14 +75,14 @@ public class KubernetesDeploymentsEndpointUriFactory extends org.apache.camel.su
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriFactory.java
index dd602c0..a4e2c51 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriFactory.java
@@ -75,14 +75,14 @@ public class KubernetesHPAEndpointUriFactory extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriFactory.java
index f544991..27b901d8 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriFactory.java
@@ -75,14 +75,14 @@ public class KubernetesJobEndpointUriFactory extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriFactory.java
index d171d3a..1f25966 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriFactory.java
@@ -75,14 +75,14 @@ public class KubernetesNamespacesEndpointUriFactory extends org.apache.camel.sup
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriFactory.java
index 0eb26a9..d906943 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriFactory.java
@@ -75,14 +75,14 @@ public class KubernetesNodesEndpointUriFactory extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriFactory.java
index f7daf0a..8f2eb8e 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class KubernetesPersistentVolumesEndpointUriFactory extends org.apache.ca
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriFactory.java
index 5f2ef80..377d8d4 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class KubernetesPersistentVolumesClaimsEndpointUriFactory extends org.apa
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriFactory.java
index d31c58d..83479aa 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriFactory.java
@@ -75,14 +75,14 @@ public class KubernetesPodsEndpointUriFactory extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriFactory.java
index c93f106..32c74af 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriFactory.java
@@ -75,14 +75,14 @@ public class KubernetesReplicationControllersEndpointUriFactory extends org.apac
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriFactory.java
index 0c04aaf..377fc23 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class KubernetesResourcesQuotaEndpointUriFactory extends org.apache.camel
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriFactory.java
index 7373f8b..90c1b9d 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class KubernetesSecretsEndpointUriFactory extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriFactory.java
index 2dea436..af8eae0 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class KubernetesServiceAccountsEndpointUriFactory extends org.apache.came
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriFactory.java
index efc2ac3..dbcfecc 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriFactory.java
@@ -75,14 +75,14 @@ public class KubernetesServicesEndpointUriFactory extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriFactory.java
index 3cf8ee4..9f13c0f 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class OpenshiftBuildConfigsEndpointUriFactory extends org.apache.camel.su
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriFactory.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriFactory.java
index b0fdfdd..92337ff 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriFactory.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class OpenshiftBuildsEndpointUriFactory extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriFactory.java b/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriFactory.java
index 73ab838..d97cffa 100644
--- a/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriFactory.java
+++ b/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriFactory.java
@@ -38,7 +38,7 @@ public class KuduEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -47,7 +47,7 @@ public class KuduEndpointUriFactory extends org.apache.camel.support.component.E
         uri = buildPathParameter(syntax, uri, "host", null, false, copy);
         uri = buildPathParameter(syntax, uri, "port", null, false, copy);
         uri = buildPathParameter(syntax, uri, "tableName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriFactory.java b/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriFactory.java
index 4d53034..97b1103 100644
--- a/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriFactory.java
+++ b/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriFactory.java
@@ -42,7 +42,7 @@ public class LanguageEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -50,7 +50,7 @@ public class LanguageEndpointUriFactory extends org.apache.camel.support.compone
 
         uri = buildPathParameter(syntax, uri, "languageName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "resourceUri", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriFactory.java b/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriFactory.java
index 0c38ba6..c744eb7 100644
--- a/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriFactory.java
+++ b/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class LdapEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "dirContextName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriFactory.java b/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriFactory.java
index d120d60..bcc2718 100644
--- a/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriFactory.java
+++ b/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriFactory.java
@@ -35,14 +35,14 @@ public class LdifEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "ldapConnectionName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriFactory.java b/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriFactory.java
index d96c250..92105ce 100644
--- a/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriFactory.java
+++ b/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriFactory.java
@@ -60,14 +60,14 @@ public class LogEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "loggerName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriFactory.java b/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriFactory.java
index b531e98..f038cb1 100644
--- a/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriFactory.java
+++ b/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriFactory.java
@@ -40,7 +40,7 @@ public class LuceneEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -48,7 +48,7 @@ public class LuceneEndpointUriFactory extends org.apache.camel.support.component
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriFactory.java b/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriFactory.java
index 64f0cac..62332a3 100644
--- a/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriFactory.java
+++ b/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriFactory.java
@@ -39,7 +39,7 @@ public class LumberjackEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -47,7 +47,7 @@ public class LumberjackEndpointUriFactory extends org.apache.camel.support.compo
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", 5044, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriFactory.java b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriFactory.java
index 6444a8c..dcf5d64 100644
--- a/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriFactory.java
+++ b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriFactory.java
@@ -109,7 +109,7 @@ public class MailEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -117,7 +117,7 @@ public class MailEndpointUriFactory extends org.apache.camel.support.component.E
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriFactory.java b/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriFactory.java
index fe69ee9..e602f8f 100644
--- a/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriFactory.java
+++ b/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriFactory.java
@@ -38,7 +38,7 @@ public class MasterEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -46,7 +46,7 @@ public class MasterEndpointUriFactory extends org.apache.camel.support.component
 
         uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
         uri = buildPathParameter(syntax, uri, "delegateUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriFactory.java b/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriFactory.java
index fcab372..e44c4b8 100644
--- a/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriFactory.java
+++ b/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriFactory.java
@@ -42,7 +42,7 @@ public class MetricsEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -50,7 +50,7 @@ public class MetricsEndpointUriFactory extends org.apache.camel.support.componen
 
         uri = buildPathParameter(syntax, uri, "metricsType", null, true, copy);
         uri = buildPathParameter(syntax, uri, "metricsName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriFactory.java b/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriFactory.java
index 7c7254f..c1434ac 100644
--- a/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriFactory.java
+++ b/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriFactory.java
@@ -41,7 +41,7 @@ public class MicrometerEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -50,7 +50,7 @@ public class MicrometerEndpointUriFactory extends org.apache.camel.support.compo
         uri = buildPathParameter(syntax, uri, "metricsType", null, true, copy);
         uri = buildPathParameter(syntax, uri, "metricsName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "tags", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriFactory.java b/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriFactory.java
index 120384d..3813d9f 100644
--- a/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriFactory.java
+++ b/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriFactory.java
@@ -47,7 +47,7 @@ public class MicroProfileMetricsEndpointUriFactory extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -55,7 +55,7 @@ public class MicroProfileMetricsEndpointUriFactory extends org.apache.camel.supp
 
         uri = buildPathParameter(syntax, uri, "metricType", null, true, copy);
         uri = buildPathParameter(syntax, uri, "metricName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java
index bcd564a..0fb4578 100644
--- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java
+++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java
@@ -65,14 +65,14 @@ public class MiloClientEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "endpointUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriFactory.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriFactory.java
index 39e8836..d3c43de 100644
--- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriFactory.java
+++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriFactory.java
@@ -38,14 +38,14 @@ public class MiloServerEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "itemId", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriFactory.java b/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriFactory.java
index 88433ac..bbcb56f 100644
--- a/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriFactory.java
+++ b/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriFactory.java
@@ -63,7 +63,7 @@ public class MinaEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -72,7 +72,7 @@ public class MinaEndpointUriFactory extends org.apache.camel.support.component.E
         uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriFactory.java b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriFactory.java
index 68f850a..8ee26b5 100644
--- a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriFactory.java
+++ b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriFactory.java
@@ -100,14 +100,14 @@ public class MinioEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "bucketName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriFactory.java b/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriFactory.java
index 6197c6c..36f84ac 100644
--- a/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriFactory.java
+++ b/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriFactory.java
@@ -62,7 +62,7 @@ public class MllpEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -70,7 +70,7 @@ public class MllpEndpointUriFactory extends org.apache.camel.support.component.E
 
         uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriFactory.java b/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriFactory.java
index 08e47c4..841f364 100644
--- a/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriFactory.java
+++ b/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriFactory.java
@@ -45,14 +45,14 @@ public class MockEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriFactory.java b/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriFactory.java
index 0b65af3..a1f3d99 100644
--- a/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriFactory.java
+++ b/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriFactory.java
@@ -50,14 +50,14 @@ public class GridFsEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "connectionBean", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriFactory.java b/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriFactory.java
index e0e786e..fd7b9d9 100644
--- a/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriFactory.java
+++ b/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriFactory.java
@@ -58,14 +58,14 @@ public class MongoDbEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "connectionBean", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriFactory.java b/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriFactory.java
index 4269076..aeaa81f 100644
--- a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriFactory.java
+++ b/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriFactory.java
@@ -44,14 +44,14 @@ public class MsvEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriFactory.java b/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriFactory.java
index 2439782..d70bec6 100644
--- a/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriFactory.java
+++ b/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class MustacheEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriFactory.java b/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriFactory.java
index 22a03f7..48285e7 100644
--- a/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriFactory.java
+++ b/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class MvelEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriFactory.java b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriFactory.java
index a58b773..18669e6 100644
--- a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriFactory.java
+++ b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriFactory.java
@@ -39,7 +39,7 @@ public class MyBatisBeanEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -47,7 +47,7 @@ public class MyBatisBeanEndpointUriFactory extends org.apache.camel.support.comp
 
         uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriFactory.java b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriFactory.java
index 57dd713..673fccd 100644
--- a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriFactory.java
+++ b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriFactory.java
@@ -64,14 +64,14 @@ public class MyBatisEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "statement", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriFactory.java b/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriFactory.java
index 5dcb06d..e1896ef 100644
--- a/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriFactory.java
+++ b/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriFactory.java
@@ -43,7 +43,7 @@ public class NagiosEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -51,7 +51,7 @@ public class NagiosEndpointUriFactory extends org.apache.camel.support.component
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriFactory.java b/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriFactory.java
index af8d131..7559095 100644
--- a/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriFactory.java
+++ b/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriFactory.java
@@ -60,14 +60,14 @@ public class NatsEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactory.java b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactory.java
index 12918bf..ee4f2bd 100644
--- a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactory.java
+++ b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriFactory.java
@@ -117,7 +117,7 @@ public class NettyHttpEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -127,7 +127,7 @@ public class NettyHttpEndpointUriFactory extends org.apache.camel.support.compon
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, false, copy);
         uri = buildPathParameter(syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriFactory.java b/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriFactory.java
index d4d784b..3d809fd 100644
--- a/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriFactory.java
+++ b/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriFactory.java
@@ -107,7 +107,7 @@ public class NettyEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -116,7 +116,7 @@ public class NettyEndpointUriFactory extends org.apache.camel.support.component.
         uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriFactory.java b/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriFactory.java
index 54c8a80..680be4e 100644
--- a/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriFactory.java
+++ b/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriFactory.java
@@ -43,14 +43,14 @@ public class NitriteEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "database", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriFactory.java b/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriFactory.java
index dede70d..767d075 100644
--- a/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriFactory.java
+++ b/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriFactory.java
@@ -51,14 +51,14 @@ public class NsqEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriFactory.java b/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriFactory.java
index c228412..64f657d 100644
--- a/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriFactory.java
+++ b/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriFactory.java
@@ -63,14 +63,14 @@ public class OAIPMHEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "baseUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriFactory.java b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriFactory.java
index 93240c0..c7684f1 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriFactory.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriFactory.java
@@ -75,7 +75,7 @@ public class Olingo2EndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -83,7 +83,7 @@ public class Olingo2EndpointUriFactory extends org.apache.camel.support.componen
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriFactory.java b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriFactory.java
index 6b4b2b25..2596833 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriFactory.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriFactory.java
@@ -73,7 +73,7 @@ public class Olingo4EndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -81,7 +81,7 @@ public class Olingo4EndpointUriFactory extends org.apache.camel.support.componen
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriFactory.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriFactory.java
index 091552b..6329c37 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriFactory.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriFactory.java
@@ -46,14 +46,14 @@ public class CinderEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriFactory.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriFactory.java
index 872998c..e3537af 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriFactory.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriFactory.java
@@ -45,14 +45,14 @@ public class GlanceEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriFactory.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriFactory.java
index 5a1cb47..0254d6e 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriFactory.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriFactory.java
@@ -45,14 +45,14 @@ public class KeystoneEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriFactory.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriFactory.java
index 5aa6f0e..8e45ece 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriFactory.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriFactory.java
@@ -46,14 +46,14 @@ public class NeutronEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriFactory.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriFactory.java
index 6109e27..ae45ccc 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriFactory.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriFactory.java
@@ -46,14 +46,14 @@ public class NovaEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriFactory.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriFactory.java
index cef9a30..194534b 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriFactory.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriFactory.java
@@ -46,14 +46,14 @@ public class SwiftEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriFactory.java b/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriFactory.java
index ad171ea..8d063c6 100644
--- a/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriFactory.java
+++ b/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriFactory.java
@@ -43,14 +43,14 @@ public class OptaPlannerEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "configFile", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriFactory.java b/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriFactory.java
index 1d1aff2..08cad2c 100644
--- a/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriFactory.java
+++ b/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriFactory.java
@@ -68,14 +68,14 @@ public class PahoEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriFactory.java b/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriFactory.java
index be4f6bc..f4a7915 100644
--- a/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriFactory.java
+++ b/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriFactory.java
@@ -43,14 +43,14 @@ public class PdfEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriFactory.java b/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriFactory.java
index e07fda6..feb289c 100644
--- a/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriFactory.java
+++ b/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriFactory.java
@@ -64,7 +64,7 @@ public class PgReplicationSlotEndpointUriFactory extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -75,7 +75,7 @@ public class PgReplicationSlotEndpointUriFactory extends org.apache.camel.suppor
         uri = buildPathParameter(syntax, uri, "port", "5432", false, copy);
         uri = buildPathParameter(syntax, uri, "database", null, true, copy);
         uri = buildPathParameter(syntax, uri, "outputPlugin", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriFactory.java b/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriFactory.java
index 97ab35b..6951ecd 100644
--- a/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriFactory.java
+++ b/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriFactory.java
@@ -47,7 +47,7 @@ public class PgEventEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -57,7 +57,7 @@ public class PgEventEndpointUriFactory extends org.apache.camel.support.componen
         uri = buildPathParameter(syntax, uri, "port", "5432", false, copy);
         uri = buildPathParameter(syntax, uri, "database", null, true, copy);
         uri = buildPathParameter(syntax, uri, "channel", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriFactory.java b/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriFactory.java
index 36f7d92..90f18c5 100644
--- a/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriFactory.java
+++ b/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriFactory.java
@@ -44,14 +44,14 @@ public class PlatformHttpEndpointUriFactory extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriFactory.java b/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriFactory.java
index 052ff3d..f12b662 100644
--- a/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriFactory.java
+++ b/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriFactory.java
@@ -47,7 +47,7 @@ public class PrinterEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -56,7 +56,7 @@ public class PrinterEndpointUriFactory extends org.apache.camel.support.componen
         uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, false, copy);
         uri = buildPathParameter(syntax, uri, "printername", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriFactory.java b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriFactory.java
index 931afda..98bafde 100644
--- a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriFactory.java
+++ b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriFactory.java
@@ -54,14 +54,14 @@ public class PubNubEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "channel", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriFactory.java b/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriFactory.java
index 9c85ec6..5e70ee5 100644
--- a/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriFactory.java
+++ b/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriFactory.java
@@ -69,7 +69,7 @@ public class PulsarEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -79,7 +79,7 @@ public class PulsarEndpointUriFactory extends org.apache.camel.support.component
         uri = buildPathParameter(syntax, uri, "tenant", null, true, copy);
         uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
         uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriFactory.java b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriFactory.java
index 77847fa..30306b8 100644
--- a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriFactory.java
+++ b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriFactory.java
@@ -53,7 +53,7 @@ public class QuartzEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -61,7 +61,7 @@ public class QuartzEndpointUriFactory extends org.apache.camel.support.component
 
         uri = buildPathParameter(syntax, uri, "groupName", "Camel", false, copy);
         uri = buildPathParameter(syntax, uri, "triggerName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriFactory.java b/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriFactory.java
index 9b3b9c3..73b881a 100644
--- a/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriFactory.java
+++ b/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriFactory.java
@@ -40,14 +40,14 @@ public class QuickfixjEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "configurationName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriFactory.java b/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriFactory.java
index 35c8e1b..df163dd 100644
--- a/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriFactory.java
+++ b/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriFactory.java
@@ -102,14 +102,14 @@ public class RabbitMQEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "exchangeName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriFactory.java b/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriFactory.java
index 866f813..eea28ac 100644
--- a/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriFactory.java
+++ b/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriFactory.java
@@ -44,14 +44,14 @@ public class ReactiveStreamsEndpointUriFactory extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "stream", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriFactory.java b/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriFactory.java
index cc037eb..09c2e1b 100644
--- a/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriFactory.java
+++ b/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriFactory.java
@@ -38,14 +38,14 @@ public class RefEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriFactory.java b/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriFactory.java
index f1a4713..ffee80c 100644
--- a/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriFactory.java
+++ b/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriFactory.java
@@ -41,7 +41,7 @@ public class RestOpenApiEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -49,7 +49,7 @@ public class RestOpenApiEndpointUriFactory extends org.apache.camel.support.comp
 
         uri = buildPathParameter(syntax, uri, "specificationUri", "openapi.json", false, copy);
         uri = buildPathParameter(syntax, uri, "operationId", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriFactory.java b/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriFactory.java
index 1b3de65..cabc631 100644
--- a/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriFactory.java
+++ b/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriFactory.java
@@ -42,7 +42,7 @@ public class RestSwaggerEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -50,7 +50,7 @@ public class RestSwaggerEndpointUriFactory extends org.apache.camel.support.comp
 
         uri = buildPathParameter(syntax, uri, "specificationUri", "swagger.json", false, copy);
         uri = buildPathParameter(syntax, uri, "operationId", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriFactory.java b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriFactory.java
index 7fa8a0d..71bf992 100644
--- a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriFactory.java
+++ b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriFactory.java
@@ -40,7 +40,7 @@ public class RestApiEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -48,7 +48,7 @@ public class RestApiEndpointUriFactory extends org.apache.camel.support.componen
 
         uri = buildPathParameter(syntax, uri, "path", null, true, copy);
         uri = buildPathParameter(syntax, uri, "contextIdPattern", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriFactory.java b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriFactory.java
index b83314a..943cdce 100644
--- a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriFactory.java
+++ b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriFactory.java
@@ -52,7 +52,7 @@ public class RestEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -61,7 +61,7 @@ public class RestEndpointUriFactory extends org.apache.camel.support.component.E
         uri = buildPathParameter(syntax, uri, "method", null, true, copy);
         uri = buildPathParameter(syntax, uri, "path", null, true, copy);
         uri = buildPathParameter(syntax, uri, "uriTemplate", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriFactory.java b/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriFactory.java
index 82a4115..e7245a6 100644
--- a/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriFactory.java
+++ b/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriFactory.java
@@ -77,14 +77,14 @@ public class ResteasyEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriFactory.java b/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriFactory.java
index f94ac77..fc0bb01 100644
--- a/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriFactory.java
+++ b/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriFactory.java
@@ -102,14 +102,14 @@ public class RobotFrameworkEndpointUriFactory extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriFactory.java b/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriFactory.java
index f873c16..3ac5cdc 100644
--- a/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriFactory.java
+++ b/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriFactory.java
@@ -61,14 +61,14 @@ public class RssEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "feedUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriFactory.java b/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriFactory.java
index d64ca1e..21648d2 100644
--- a/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriFactory.java
+++ b/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriFactory.java
@@ -35,14 +35,14 @@ public class SagaEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "action", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriFactory.java b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriFactory.java
index 5cd1922..a1df3b1 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriFactory.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriFactory.java
@@ -78,7 +78,7 @@ public class SalesforceEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -86,7 +86,7 @@ public class SalesforceEndpointUriFactory extends org.apache.camel.support.compo
 
         uri = buildPathParameter(syntax, uri, "operationName", null, false, copy);
         uri = buildPathParameter(syntax, uri, "topicName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriFactory.java b/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriFactory.java
index a47229d..8d53687 100644
--- a/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriFactory.java
+++ b/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriFactory.java
@@ -43,14 +43,14 @@ public class NetWeaverEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "url", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriFactory.java b/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriFactory.java
index 74656bd..ce128ae 100644
--- a/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriFactory.java
+++ b/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriFactory.java
@@ -66,14 +66,14 @@ public class XQueryEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriFactory.java b/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriFactory.java
index 1af4116..1da55a9 100644
--- a/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriFactory.java
+++ b/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriFactory.java
@@ -54,14 +54,14 @@ public class SchedulerEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriFactory.java b/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriFactory.java
index 0d2539a..c91e867 100644
--- a/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriFactory.java
+++ b/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriFactory.java
@@ -38,14 +38,14 @@ public class SchematronEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriFactory.java b/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriFactory.java
index 1fba9b6..4059e02 100644
--- a/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriFactory.java
+++ b/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriFactory.java
@@ -52,14 +52,14 @@ public class SedaEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriFactory.java b/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriFactory.java
index dce0073..0643561 100644
--- a/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriFactory.java
+++ b/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriFactory.java
@@ -37,14 +37,14 @@ public class ServiceEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "delegateUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriFactory.java b/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriFactory.java
index 3537fc7..4795f08 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriFactory.java
+++ b/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriFactory.java
@@ -84,14 +84,14 @@ public class ServiceNowEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "instanceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriFactory.java b/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriFactory.java
index 7efa28c..1eb9336 100644
--- a/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriFactory.java
+++ b/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriFactory.java
@@ -56,14 +56,14 @@ public class ServletEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "contextPath", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriFactory.java b/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriFactory.java
index 97cce98..155c59b 100644
--- a/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriFactory.java
+++ b/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriFactory.java
@@ -84,14 +84,14 @@ public class SipEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "uri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
index 4ad9172..9d95a41 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriFactory.java
@@ -71,7 +71,7 @@ public class SjmsEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -79,7 +79,7 @@ public class SjmsEndpointUriFactory extends org.apache.camel.support.component.E
 
         uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
         uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriFactory.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriFactory.java
index 48fbda8..f9b7e46 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriFactory.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriFactory.java
@@ -56,14 +56,14 @@ public class SjmsBatchEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
index e74dc53..710af11 100644
--- a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
+++ b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriFactory.java
@@ -74,7 +74,7 @@ public class Sjms2EndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -82,7 +82,7 @@ public class Sjms2EndpointUriFactory extends org.apache.camel.support.component.
 
         uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
         uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriFactory.java b/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriFactory.java
index 790b822..291ac2c 100644
--- a/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriFactory.java
+++ b/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriFactory.java
@@ -64,14 +64,14 @@ public class SlackEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "channel", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriFactory.java b/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriFactory.java
index d3ae14a..f71f84b 100644
--- a/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriFactory.java
+++ b/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriFactory.java
@@ -82,7 +82,7 @@ public class SmppEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -90,7 +90,7 @@ public class SmppEndpointUriFactory extends org.apache.camel.support.component.E
 
         uri = buildPathParameter(syntax, uri, "host", "localhost", false, copy);
         uri = buildPathParameter(syntax, uri, "port", "2775", false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriFactory.java b/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriFactory.java
index b15bd07..4aeafe1 100644
--- a/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriFactory.java
+++ b/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriFactory.java
@@ -76,7 +76,7 @@ public class SnmpEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -84,7 +84,7 @@ public class SnmpEndpointUriFactory extends org.apache.camel.support.component.E
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriFactory.java b/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriFactory.java
index 18e5f69..df38a8d 100644
--- a/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriFactory.java
+++ b/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriFactory.java
@@ -58,14 +58,14 @@ public class SolrEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "url", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriFactory.java b/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriFactory.java
index 8d189af..bc10448 100644
--- a/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriFactory.java
+++ b/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriFactory.java
@@ -56,14 +56,14 @@ public class SoroushBotEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "action", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriFactory.java b/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriFactory.java
index 6515ca6..69076fc 100644
--- a/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriFactory.java
+++ b/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriFactory.java
@@ -40,14 +40,14 @@ public class SparkEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "endpointType", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriFactory.java b/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriFactory.java
index 065edef..c502e10 100644
--- a/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriFactory.java
+++ b/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriFactory.java
@@ -42,7 +42,7 @@ public class SplunkHECEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -50,7 +50,7 @@ public class SplunkHECEndpointUriFactory extends org.apache.camel.support.compon
 
         uri = buildPathParameter(syntax, uri, "splunkURL", null, true, copy);
         uri = buildPathParameter(syntax, uri, "token", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriFactory.java b/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriFactory.java
index b248c6a..391ae37 100644
--- a/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriFactory.java
+++ b/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriFactory.java
@@ -80,14 +80,14 @@ public class SplunkEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriFactory.java b/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriFactory.java
index 5936fe8..f03b6ce 100644
--- a/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriFactory.java
+++ b/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriFactory.java
@@ -38,14 +38,14 @@ public class SpringBatchEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "jobName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriFactory.java b/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriFactory.java
index 41e478e..8384125 100644
--- a/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriFactory.java
+++ b/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class SpringIntegrationEndpointUriFactory extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "defaultChannel", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriFactory.java b/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriFactory.java
index 48360c9..c40c4fa 100644
--- a/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriFactory.java
+++ b/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriFactory.java
@@ -37,14 +37,14 @@ public class SpringLdapEndpointUriFactory extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "templateName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriFactory.java b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriFactory.java
index 227fc8e..a73f9af 100644
--- a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriFactory.java
+++ b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriFactory.java
@@ -45,7 +45,7 @@ public class RedisEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -53,7 +53,7 @@ public class RedisEndpointUriFactory extends org.apache.camel.support.component.
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriFactory.java b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriFactory.java
index 30563b1..d383a45 100644
--- a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriFactory.java
+++ b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriFactory.java
@@ -58,7 +58,7 @@ public class SpringWebserviceEndpointUriFactory extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -68,7 +68,7 @@ public class SpringWebserviceEndpointUriFactory extends org.apache.camel.support
         uri = buildPathParameter(syntax, uri, "lookupKey", null, false, copy);
         uri = buildPathParameter(syntax, uri, "webServiceEndpointUri", null, false, copy);
         uri = buildPathParameter(syntax, uri, "expression", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriFactory.java b/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriFactory.java
index 751bbf0..f01003b 100644
--- a/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriFactory.java
+++ b/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriFactory.java
@@ -38,14 +38,14 @@ public class EventEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriFactory.java b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriFactory.java
index 43af706..a9ca152 100644
--- a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriFactory.java
+++ b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriFactory.java
@@ -80,14 +80,14 @@ public class SqlEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "query", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriFactory.java b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriFactory.java
index e853abb..6cfb97f 100644
--- a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriFactory.java
+++ b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class SqlStoredEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "template", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriFactory.java b/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriFactory.java
index 6a43d7a..0bcd2b5 100644
--- a/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriFactory.java
+++ b/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriFactory.java
@@ -72,7 +72,7 @@ public class SshEndpointUriFactory extends org.apache.camel.support.component.En
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -80,7 +80,7 @@ public class SshEndpointUriFactory extends org.apache.camel.support.component.En
 
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", 22, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriFactory.java b/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriFactory.java
index c570ccd..5b30c8e 100644
--- a/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriFactory.java
+++ b/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriFactory.java
@@ -35,14 +35,14 @@ public class StAXEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "contentHandlerClass", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriFactory.java b/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriFactory.java
index 5ee661b..a3b4478 100644
--- a/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriFactory.java
+++ b/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriFactory.java
@@ -49,14 +49,14 @@ public class StompEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "destination", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriFactory.java b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriFactory.java
index 73a8229..f637090 100644
--- a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriFactory.java
+++ b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriFactory.java
@@ -53,14 +53,14 @@ public class StreamEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "kind", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriFactory.java b/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriFactory.java
index eaf8aa9..24220dd 100644
--- a/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriFactory.java
+++ b/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriFactory.java
@@ -40,14 +40,14 @@ public class StringTemplateEndpointUriFactory extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriFactory.java b/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriFactory.java
index baf0597..d76295f 100644
--- a/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriFactory.java
+++ b/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriFactory.java
@@ -52,14 +52,14 @@ public class StubEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriFactory.java b/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriFactory.java
index 7e10b97..acbb7b6 100644
--- a/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriFactory.java
+++ b/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriFactory.java
@@ -66,14 +66,14 @@ public class TelegramEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriFactory.java b/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriFactory.java
index efc75d8..7c8bbd8 100644
--- a/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriFactory.java
+++ b/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriFactory.java
@@ -48,7 +48,7 @@ public class ThriftEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -57,7 +57,7 @@ public class ThriftEndpointUriFactory extends org.apache.camel.support.component
         uri = buildPathParameter(syntax, uri, "host", null, false, copy);
         uri = buildPathParameter(syntax, uri, "port", null, true, copy);
         uri = buildPathParameter(syntax, uri, "service", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriFactory.java b/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriFactory.java
index a930bf2..08b57c7 100644
--- a/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriFactory.java
+++ b/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class TikaEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriFactory.java b/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriFactory.java
index 6f9564d..dc5487a 100644
--- a/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriFactory.java
+++ b/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriFactory.java
@@ -46,14 +46,14 @@ public class TimerEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "timerName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriFactory.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriFactory.java
index db302bc..8c89b3f 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriFactory.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriFactory.java
@@ -100,7 +100,7 @@ public class TwilioEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -108,7 +108,7 @@ public class TwilioEndpointUriFactory extends org.apache.camel.support.component
 
         uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriFactory.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriFactory.java
index cc681c3..c8ef44c 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriFactory.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriFactory.java
@@ -81,14 +81,14 @@ public class TwitterDirectMessageEndpointUriFactory extends org.apache.camel.sup
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "user", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriFactory.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriFactory.java
index ee36416..d3bd2fe 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriFactory.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriFactory.java
@@ -81,14 +81,14 @@ public class TwitterSearchEndpointUriFactory extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "keywords", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriFactory.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriFactory.java
index 456bb5e..3091498 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriFactory.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriFactory.java
@@ -82,14 +82,14 @@ public class TwitterTimelineEndpointUriFactory extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "timelineType", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriFactory.java b/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriFactory.java
index c3730c6..8c5dc62 100644
--- a/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriFactory.java
+++ b/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriFactory.java
@@ -63,14 +63,14 @@ public class UndertowEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "httpURI", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriFactory.java b/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriFactory.java
index cf134b1..ea3b0f7 100644
--- a/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriFactory.java
+++ b/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriFactory.java
@@ -44,14 +44,14 @@ public class ValidatorEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriFactory.java b/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriFactory.java
index 1e45af0..096ee89 100644
--- a/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriFactory.java
+++ b/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriFactory.java
@@ -41,14 +41,14 @@ public class VelocityEndpointUriFactory extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriFactory.java b/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriFactory.java
index 212a389..543e37a 100644
--- a/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriFactory.java
+++ b/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriFactory.java
@@ -56,14 +56,14 @@ public class VertxHttpEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriFactory.java b/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriFactory.java
index cb59a44..283ef83 100644
--- a/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriFactory.java
+++ b/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriFactory.java
@@ -46,7 +46,7 @@ public class VertxWebsocketEndpointUriFactory extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -55,7 +55,7 @@ public class VertxWebsocketEndpointUriFactory extends org.apache.camel.support.c
         uri = buildPathParameter(syntax, uri, "host", "0.0.0.0", false, copy);
         uri = buildPathParameter(syntax, uri, "port", 0, false, copy);
         uri = buildPathParameter(syntax, uri, "path", "/", true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriFactory.java b/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriFactory.java
index fc9979b..69ceeed 100644
--- a/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriFactory.java
+++ b/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class VertxEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "address", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriFactory.java b/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriFactory.java
index 8f618e5..ac88b32 100644
--- a/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriFactory.java
+++ b/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriFactory.java
@@ -52,14 +52,14 @@ public class VmEndpointUriFactory extends org.apache.camel.support.component.End
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriFactory.java b/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriFactory.java
index 36eae9d..983bee5 100644
--- a/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriFactory.java
+++ b/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriFactory.java
@@ -74,14 +74,14 @@ public class WeatherEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriFactory.java b/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriFactory.java
index 66abdc9..ee22e09 100644
--- a/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriFactory.java
+++ b/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriFactory.java
@@ -72,14 +72,14 @@ public class Web3jEndpointUriFactory extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "nodeAddress", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriFactory.java b/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriFactory.java
index 56642a3..e124623 100644
--- a/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriFactory.java
+++ b/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriFactory.java
@@ -42,14 +42,14 @@ public class WebhookEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "endpointUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriFactory.java b/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriFactory.java
index fcfb515..25efed1 100644
--- a/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriFactory.java
+++ b/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class JSR356WebSocketEndpointUriFactory extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "uri", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriFactory.java b/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriFactory.java
index 64f8e90..a568b0f 100644
--- a/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriFactory.java
+++ b/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriFactory.java
@@ -54,7 +54,7 @@ public class WebsocketEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -63,7 +63,7 @@ public class WebsocketEndpointUriFactory extends org.apache.camel.support.compon
         uri = buildPathParameter(syntax, uri, "host", "0.0.0.0", false, copy);
         uri = buildPathParameter(syntax, uri, "port", "9292", false, copy);
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriFactory.java b/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriFactory.java
index e43fdde..94cf3f5 100644
--- a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriFactory.java
+++ b/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriFactory.java
@@ -44,14 +44,14 @@ public class WekaEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "command", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriFactory.java b/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriFactory.java
index 4a3fcc3..f596d53 100644
--- a/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriFactory.java
+++ b/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriFactory.java
@@ -47,7 +47,7 @@ public class WordpressEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -55,7 +55,7 @@ public class WordpressEndpointUriFactory extends org.apache.camel.support.compon
 
         uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
         uri = buildPathParameter(syntax, uri, "operationDetail", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriFactory.java b/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriFactory.java
index dc01516..7f44074 100644
--- a/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriFactory.java
+++ b/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriFactory.java
@@ -47,7 +47,7 @@ public class WorkdayEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -55,7 +55,7 @@ public class WorkdayEndpointUriFactory extends org.apache.camel.support.componen
 
         uri = buildPathParameter(syntax, uri, "entity", null, true, copy);
         uri = buildPathParameter(syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriFactory.java b/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriFactory.java
index fc3a6a0..e4b7608 100644
--- a/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriFactory.java
+++ b/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriFactory.java
@@ -39,14 +39,14 @@ public class XChangeEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriFactory.java b/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriFactory.java
index cd3dab5..53c4f02 100644
--- a/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriFactory.java
+++ b/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriFactory.java
@@ -51,14 +51,14 @@ public class XJEndpointUriFactory extends org.apache.camel.support.component.End
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriFactory.java b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriFactory.java
index 0873321..c2921d9 100644
--- a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriFactory.java
+++ b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriFactory.java
@@ -61,14 +61,14 @@ public class XmlSignerEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriFactory.java b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriFactory.java
index 1abb43d..ae18b7e 100644
--- a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriFactory.java
+++ b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriFactory.java
@@ -51,14 +51,14 @@ public class XmlVerifierEndpointUriFactory extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriFactory.java b/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriFactory.java
index c4250cf..2808cf0 100644
--- a/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriFactory.java
+++ b/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriFactory.java
@@ -59,7 +59,7 @@ public class XmppEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -68,7 +68,7 @@ public class XmppEndpointUriFactory extends org.apache.camel.support.component.E
         uri = buildPathParameter(syntax, uri, "host", null, true, copy);
         uri = buildPathParameter(syntax, uri, "port", null, true, copy);
         uri = buildPathParameter(syntax, uri, "participant", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriFactory.java b/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriFactory.java
index 0bc9be8..51a0d68 100644
--- a/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriFactory.java
+++ b/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriFactory.java
@@ -50,14 +50,14 @@ public class XsltSaxonEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriFactory.java b/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriFactory.java
index 2dbcb26..135b996 100644
--- a/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriFactory.java
+++ b/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriFactory.java
@@ -47,14 +47,14 @@ public class XsltEndpointUriFactory extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriFactory.java b/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriFactory.java
index f333ad5..27fae9a 100644
--- a/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriFactory.java
+++ b/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriFactory.java
@@ -67,14 +67,14 @@ public class YammerEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "function", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriFactory.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriFactory.java
index 119fdbe..e04adc1 100644
--- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriFactory.java
+++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriFactory.java
@@ -178,14 +178,14 @@ public class ZendeskEndpointUriFactory extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(properties);
 
         uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriFactory.java b/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriFactory.java
index 1b98b4d..52727e6 100644
--- a/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriFactory.java
+++ b/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriFactory.java
@@ -38,7 +38,7 @@ public class MasterEndpointUriFactory extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -46,7 +46,7 @@ public class MasterEndpointUriFactory extends org.apache.camel.support.component
 
         uri = buildPathParameter(syntax, uri, "groupName", null, true, copy);
         uri = buildPathParameter(syntax, uri, "consumerEndpointUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }
 
diff --git a/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriFactory.java b/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriFactory.java
index 4e1ec60..f8db225 100644
--- a/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriFactory.java
+++ b/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriFactory.java
@@ -46,7 +46,7 @@ public class ZooKeeperEndpointUriFactory extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(String scheme, Map<String, Object> properties) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> properties, boolean encode) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
@@ -54,7 +54,7 @@ public class ZooKeeperEndpointUriFactory extends org.apache.camel.support.compon
 
         uri = buildPathParameter(syntax, uri, "serverUrls", null, true, copy);
         uri = buildPathParameter(syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
+        uri = buildQueryParameters(uri, copy, encode);
         return uri;
     }