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

[camel] branch uri-assembler created (now 78c49bb)

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

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


      at 78c49bb  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP

This branch includes the following new commits:

     new c058557  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new 1671183  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new 566ce67  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new 07b9d7f  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new f2034e1  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new b497a65  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new fe0b854  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new f3d4a45  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new 21ca936  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new 98425c1  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new 3ee633a  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new 6e66818  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new c88fdd0  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new 03639e2  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new b993020  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
     new 78c49bb  CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP

The 16 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.



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

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

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

commit 98425c18b3b2a112319879dfe4bf0ee21bb61db0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 13:18:29 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../catalog/CustomEndpointUriAssemblerTest.java    | 67 +++++++++++++++++++++-
 .../component/EndpointUriAssemblerSupport.java     |  4 +-
 2 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
index 4dbdb16..d0bb0ff 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
@@ -102,7 +102,7 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         params.put("amount", "123");
 
         String uri = assembler.buildUri(context, "acme", params);
-        Assertions.assertEquals("acme:bar:8080?amount=123&verbose=false", uri);
+        Assertions.assertEquals("acme:bar?amount=123&verbose=false", uri);
     }
 
     @Test
@@ -116,7 +116,7 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         params.put("amount", "123");
 
         String uri = assembler.buildUri(context, "acme2", params);
-        Assertions.assertEquals("acme2:bar/moes:8080?amount=123&verbose=true", uri);
+        Assertions.assertEquals("acme2:bar/moes?amount=123&verbose=true", uri);
     }
 
     @Test
@@ -158,7 +158,45 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         params.put("amount", "123");
 
         String uri = assembler.buildUri(context, "acme2", params);
-        Assertions.assertEquals("acme2:bar:8080?amount=123&verbose=true", uri);
+        Assertions.assertEquals("acme2:bar?amount=123&verbose=true", uri);
+    }
+
+    @Test
+    public void testJms() throws Exception {
+        EndpointUriAssembler assembler = new MyJmsAssembler();
+
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("destinationName", "foo");
+        params.put("destinationType", "topic");
+        params.put("deliveryPersistent", true);
+
+        String uri = assembler.buildUri(context, "jms2", params);
+        Assertions.assertEquals("jms2:topic:foo?deliveryPersistent=true", uri);
+    }
+
+    @Test
+    public void testJmsMatchDefault() throws Exception {
+        EndpointUriAssembler assembler = new MyJmsAssembler();
+
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("destinationName", "foo");
+        params.put("destinationType", "queue");
+        params.put("deliveryPersistent", true);
+
+        String uri = assembler.buildUri(context, "jms2", params);
+        Assertions.assertEquals("jms2:queue:foo?deliveryPersistent=true", uri);
+    }
+
+    @Test
+    public void testJmsNoDefault() throws Exception {
+        EndpointUriAssembler assembler = new MyJmsAssembler();
+
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("destinationName", "foo");
+        params.put("deliveryPersistent", true);
+
+        String uri = assembler.buildUri(context, "jms2", params);
+        Assertions.assertEquals("jms2:foo?deliveryPersistent=true", uri);
     }
 
     private class MyAssembler extends EndpointUriAssemblerSupport implements EndpointUriAssembler {
@@ -214,4 +252,27 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
 
     }
 
+    private class MyJmsAssembler extends EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+        private static final String SYNTAX = "jms2:destinationType:destinationName";
+
+        @Override
+        public boolean isEnabled(String scheme) {
+            return "jms2".equals(scheme);
+        }
+
+        @Override
+        public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters)
+                throws URISyntaxException {
+
+            String uri = SYNTAX;
+            uri = buildPathParameter(camelContext, SYNTAX, uri, "destinationType", "queue", false, parameters);
+            uri = buildPathParameter(camelContext, SYNTAX, uri, "destinationName", null, true, parameters);
+            uri = buildQueryParameters(camelContext, uri, parameters);
+
+            return uri;
+        }
+
+    }
+
 }
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
index 9dfa259..cb6ee24 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
@@ -34,7 +34,7 @@ public abstract class EndpointUriAssemblerSupport {
             CamelContext camelContext, String syntax, String uri, String name, Object defaultValue, boolean required,
             Map<String, Object> parameters) {
         Object obj = parameters.remove(name);
-        if (ObjectHelper.isEmpty(obj) && defaultValue != null) {
+        if (ObjectHelper.isEmpty(obj) && defaultValue != null && required) {
             obj = camelContext.getTypeConverter().convertTo(String.class, defaultValue);
         }
         if (ObjectHelper.isEmpty(obj) && required) {
@@ -59,8 +59,6 @@ public abstract class EndpointUriAssemblerSupport {
             }
         }
 
-        // TODO: value == defaultValue and required = false => remove from path as that is better (eg camel-jms)
-
         return uri;
     }
 


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

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

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

commit fe0b8542a0e614915bdd94d1d1ca20cd15d2426d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 11:45:18 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../runtime-camelcatalog-endpointuriassembler      |  2 -
 .../impl/CamelCatalogEndpointUriAssembler.java     | 40 --------------------
 ...untimeCamelCatalogEndpointUriAssemblerTest.java | 13 -------
 .../apache/camel/impl/AssembleResolverTest.java    | 43 ----------------------
 4 files changed, 98 deletions(-)

diff --git a/core/camel-core-catalog/src/generated/resources/META-INF/services/org/apache/camel/runtime-camelcatalog-endpointuriassembler b/core/camel-core-catalog/src/generated/resources/META-INF/services/org/apache/camel/runtime-camelcatalog-endpointuriassembler
deleted file mode 100644
index ec29104..0000000
--- a/core/camel-core-catalog/src/generated/resources/META-INF/services/org/apache/camel/runtime-camelcatalog-endpointuriassembler
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.catalog.impl.CamelCatalogEndpointUriAssembler
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java
deleted file mode 100644
index 13aaba1..0000000
--- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.camel.catalog.impl;
-
-import java.net.URISyntaxException;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.catalog.RuntimeCamelCatalog;
-import org.apache.camel.spi.EndpointUriAssembler;
-import org.apache.camel.spi.annotations.JdkService;
-
-import static org.apache.camel.catalog.RuntimeCamelCatalog.ENDPOINT_URI_ASSEMBLER_FACTORY;
-
-/**
- * Uses {@link RuntimeCamelCatalog} to assemble the endpoint uri.
- */
-@JdkService(ENDPOINT_URI_ASSEMBLER_FACTORY)
-@Deprecated
-public class CamelCatalogEndpointUriAssembler implements EndpointUriAssembler {
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        // as its a fallback then assume it can handle this
-        return true;
-    }
-
-    @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) {
-        try {
-            Map<String, String> copy = new LinkedHashMap<>();
-            parameters.forEach((k, v) -> copy.put(k, v != null ? v.toString() : null));
-            return camelContext.adapt(ExtendedCamelContext.class).getRuntimeCamelCatalog().asEndpointUri(scheme, copy,
-                    false);
-        } catch (URISyntaxException e) {
-            throw RuntimeCamelException.wrapRuntimeException(e);
-        }
-    }
-}
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
index a3cf85b..f52d4a7 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
@@ -21,7 +21,6 @@ import java.util.Map;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.catalog.impl.CamelCatalogEndpointUriAssembler;
 import org.apache.camel.spi.EndpointUriAssembler;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -41,16 +40,4 @@ public class RuntimeCamelCatalogEndpointUriAssemblerTest extends ContextTestSupp
         Assertions.assertEquals("timer:foo?period=123&repeatCount=5", uri);
     }
 
-    @Test
-    public void testRuntimeAssemble() throws Exception {
-        EndpointUriAssembler assembler = new CamelCatalogEndpointUriAssembler();
-
-        Map<String, Object> params = new HashMap<>();
-        params.put("timerName", "foo");
-        params.put("period", "123");
-        params.put("repeatCount", "5");
-
-        String uri = assembler.buildUri(context, "timer", params);
-        Assertions.assertEquals("timer:foo?period=123&repeatCount=5", uri);
-    }
 }
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/AssembleResolverTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/AssembleResolverTest.java
deleted file mode 100644
index f4225d9..0000000
--- a/core/camel-core/src/test/java/org/apache/camel/impl/AssembleResolverTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.impl;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.catalog.impl.CamelCatalogEndpointUriAssembler;
-import org.apache.camel.spi.EndpointUriAssembler;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class AssembleResolverTest extends ContextTestSupport {
-
-    @Test
-    public void testAssembleResolver() throws Exception {
-        // will use source code generated
-        EndpointUriAssembler assembler = context.adapt(ExtendedCamelContext.class).getAssemblerResolver()
-                .resolveAssembler("log", context);
-        Assertions.assertNotNull(assembler);
-        // TODO: check classname
-
-        // will then use fallback that is catalog based
-        assembler = context.adapt(ExtendedCamelContext.class).getAssemblerResolver()
-                .resolveAssembler("unknown", context);
-        Assertions.assertNotNull(assembler);
-        boolean catalog = assembler instanceof CamelCatalogEndpointUriAssembler;
-        Assertions.assertTrue(catalog);
-    }
-}


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

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

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

commit 566ce671d839dcce0a8fc41403d574266c84b85d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 08:55:20 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../component/ahc/AhcEndpointUriAssembler.java     | 22 ++++++
 .../org/apache/camel/assembler/ahc-endpoint        |  2 +
 .../EventbridgeEndpointUriAssembler.java           | 22 ++++++
 .../camel/assembler/aws2-eventbridge-endpoint      |  2 +
 .../catalog/CustomEndpointUriAssemblerTest.java    | 80 ++++++++++++++++++++
 ...untimeCamelCatalogEndpointUriAssemblerTest.java | 16 +++-
 .../component/EndpointUriAssemblerSupport.java     | 86 ++++++----------------
 7 files changed, 167 insertions(+), 63 deletions(-)

diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
new file mode 100644
index 0000000..751a18a
--- /dev/null
+++ b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
@@ -0,0 +1,22 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.ahc;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+import org.apache.camel.component.ahc.AhcComponent;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+@SuppressWarnings("unchecked")
+public class AhcEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) throws URISyntaxException {
+        return null;
+    }
+}
+
diff --git a/components/camel-ahc/src/generated/resources/META-INF/services/org/apache/camel/assembler/ahc-endpoint b/components/camel-ahc/src/generated/resources/META-INF/services/org/apache/camel/assembler/ahc-endpoint
new file mode 100644
index 0000000..6fac227
--- /dev/null
+++ b/components/camel-ahc/src/generated/resources/META-INF/services/org/apache/camel/assembler/ahc-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ahc.AhcEndpointUriAssembler
diff --git a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
new file mode 100644
index 0000000..088da23
--- /dev/null
+++ b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
@@ -0,0 +1,22 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.eventbridge;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+import org.apache.camel.component.aws2.eventbridge.EventbridgeComponent;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+@SuppressWarnings("unchecked")
+public class EventbridgeEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) throws URISyntaxException {
+        return null;
+    }
+}
+
diff --git a/components/camel-aws2-eventbridge/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-eventbridge-endpoint b/components/camel-aws2-eventbridge/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-eventbridge-endpoint
new file mode 100644
index 0000000..0369ad0
--- /dev/null
+++ b/components/camel-aws2-eventbridge/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-eventbridge-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.eventbridge.EventbridgeEndpointUriAssembler
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
new file mode 100644
index 0000000..e92fe0d
--- /dev/null
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.catalog;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.spi.EndpointUriAssembler;
+import org.apache.camel.support.component.EndpointUriAssemblerSupport;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
+
+    @Test
+    public void testCustomAssemble() throws Exception {
+        EndpointUriAssembler assembler = new MyAssembler();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("timerName", "foo");
+        params.put("period", "123");
+        params.put("repeatCount", "5");
+
+        String uri = assembler.buildUri(context, "timer", params);
+        Assertions.assertEquals("timer:foo?period=123&repeatCount=5", uri);
+    }
+
+    @Test
+    public void testCustomAssembleUnsorted() throws Exception {
+        EndpointUriAssembler assembler = new MyAssembler();
+
+        Map<String, String> params = new LinkedHashMap<>();
+        params.put("timerName", "foo");
+        params.put("repeatCount", "5");
+        params.put("period", "123");
+
+        String uri = assembler.buildUri(context, "timer", params);
+        Assertions.assertEquals("timer:foo?period=123&repeatCount=5", uri);
+    }
+
+    private class MyAssembler extends EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+        private static final String SYNTAX = "timer:timerName";
+
+        @Override
+        public String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) throws URISyntaxException {
+            // begin from syntax
+            String uri = SYNTAX;
+
+            // TODO: optional path parameters that are missing
+
+            // append path parameters
+            uri = buildPathParameter(camelContext, SYNTAX, uri, "timerName", null, true, parameters);
+            // append remainder parameters
+            uri = buildQueryParameters(camelContext, uri, parameters);
+
+            return uri;
+        }
+
+    }
+
+}
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
index 3bdf989..fbf620b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
@@ -21,6 +21,7 @@ import java.util.Map;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.catalog.impl.CamelCatalogEndpointUriAssembler;
 import org.apache.camel.spi.EndpointUriAssembler;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -28,7 +29,7 @@ import org.junit.jupiter.api.Test;
 public class RuntimeCamelCatalogEndpointUriAssemblerTest extends ContextTestSupport {
 
     @Test
-    public void testAssemble() throws Exception {
+    public void testLookupAssemble() throws Exception {
         EndpointUriAssembler assembler = context.adapt(ExtendedCamelContext.class).getEndpointUriAssembler("timer");
 
         Map<String, String> params = new HashMap<>();
@@ -39,4 +40,17 @@ public class RuntimeCamelCatalogEndpointUriAssemblerTest extends ContextTestSupp
         String uri = assembler.buildUri(context, "timer", params);
         Assertions.assertEquals("timer:foo?period=123&repeatCount=5", uri);
     }
+
+    @Test
+    public void testRuntimeAssemble() throws Exception {
+        EndpointUriAssembler assembler = new CamelCatalogEndpointUriAssembler();
+
+        Map<String, String> params = new HashMap<>();
+        params.put("timerName", "foo");
+        params.put("period", "123");
+        params.put("repeatCount", "5");
+
+        String uri = assembler.buildUri(context, "timer", params);
+        Assertions.assertEquals("timer:foo?period=123&repeatCount=5", uri);
+    }
 }
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
index 95ea8c1..b74fbae 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
@@ -16,12 +16,13 @@
  */
 package org.apache.camel.support.component;
 
-import java.util.List;
+import java.net.URISyntaxException;
+import java.util.Map;
+import java.util.TreeMap;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.NoSuchBeanException;
-import org.apache.camel.support.EndpointHelper;
-import org.apache.camel.util.TimeUtils;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.URISupport;
 
 /**
  * Base class used by Camel Package Maven Plugin when it generates source code for fast endpoint uri assembler via
@@ -29,66 +30,27 @@ import org.apache.camel.util.TimeUtils;
  */
 public abstract class EndpointUriAssemblerSupport {
 
-    /**
-     * Converts the property to the expected type
-     *
-     * @param  camelContext the camel context
-     * @param  type         the expected type
-     * @param  value        the value
-     * @return              the value converted to the expected type
-     */
-    public static <T> T property(CamelContext camelContext, Class<T> type, Object value) {
-        // if the type is not string based and the value is a bean reference, then we need to lookup
-        // the bean from the registry
-        if (value instanceof String && String.class != type) {
-            String text = value.toString();
-
-            if (EndpointHelper.isReferenceParameter(text)) {
-                Object obj;
-                // special for a list where we refer to beans which can be either a list or a single element
-                // so use Object.class as type
-                if (type == List.class) {
-                    obj = EndpointHelper.resolveReferenceListParameter(camelContext, text, Object.class);
-                } else {
-                    obj = EndpointHelper.resolveReferenceParameter(camelContext, text, type);
-                }
-                if (obj == null) {
-                    // no bean found so throw an exception
-                    throw new NoSuchBeanException(text, type.getName());
-                }
-                value = obj;
-            } else if (type == long.class || type == Long.class || type == int.class || type == Integer.class) {
-                Object obj = null;
-                // string to long/int then it may be a duration where we can convert the value to milli seconds
-                // it may be a time pattern, such as 5s for 5 seconds = 5000
-                try {
-                    long num = TimeUtils.toMilliSeconds(text);
-                    if (type == int.class || type == Integer.class) {
-                        // need to cast to int
-                        obj = (int) num;
-                    } else {
-                        obj = num;
-                    }
-                } catch (IllegalArgumentException e) {
-                    // ignore
-                }
-                if (obj != null) {
-                    value = obj;
-                }
-            }
+    protected String buildPathParameter(CamelContext camelContext, String syntax, String uri, String name, String defaultValue, boolean required, Map<String, String> parameters) {
+        String obj = parameters.remove(name);
+        if (ObjectHelper.isEmpty(obj)) {
+            obj = defaultValue;
         }
-
-        // special for boolean values with string values as we only want to accept "true" or "false"
-        if ((type == Boolean.class || type == boolean.class) && value instanceof String) {
-            String text = (String) value;
-            if (!text.equalsIgnoreCase("true") && !text.equalsIgnoreCase("false")) {
-                throw new IllegalArgumentException(
-                        "Cannot convert the String value: " + value + " to type: " + type
-                                                   + " as the value is not true or false");
-            }
+        if (ObjectHelper.isEmpty(obj) && required) {
+            throw new IllegalArgumentException("Option " + name + " is required when creating endpoint uri with syntax " + syntax);
         }
-
-        return camelContext.getTypeConverter().convertTo(type, value);
+        if (ObjectHelper.isNotEmpty(obj)) {
+            uri = uri.replace(name, obj);
+        }
+        return uri;
     }
 
+    protected String buildQueryParameters(CamelContext camelContext, String uri, Map<String, String> parameters) throws URISyntaxException {
+        // we want sorted parameters
+        Map map = new TreeMap(parameters);
+        String query = URISupport.createQueryString(map);
+        if (ObjectHelper.isNotEmpty(query)) {
+            uri = uri + "?" + query;
+        }
+        return uri;
+    }
 }


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

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

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

commit c88fdd0f9cdf7830c2afe2172f041b3ad3fbec27
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 17:32:28 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../component/activemq/ActiveMQEndpointUriAssembler.java  |  9 ++++-----
 .../camel/component/ahc/ws/WsEndpointUriAssembler.java    |  7 +++----
 .../camel/component/ahc/AhcEndpointUriAssembler.java      |  7 +++----
 .../camel/component/amqp/AMQPEndpointUriAssembler.java    |  9 ++++-----
 .../camel/component/apns/ApnsEndpointUriAssembler.java    |  7 +++----
 .../component/arangodb/ArangoDbEndpointUriAssembler.java  |  7 +++----
 .../camel/component/as2/AS2EndpointUriAssembler.java      |  9 ++++-----
 .../component/asterisk/AsteriskEndpointUriAssembler.java  |  7 +++----
 .../camel/component/atmos/AtmosEndpointUriAssembler.java  |  9 ++++-----
 .../websocket/WebsocketEndpointUriAssembler.java          |  7 +++----
 .../camel/component/atom/AtomEndpointUriAssembler.java    |  7 +++----
 .../atomix/client/map/AtomixMapEndpointUriAssembler.java  |  7 +++----
 .../messaging/AtomixMessagingEndpointUriAssembler.java    |  7 +++----
 .../multimap/AtomixMultiMapEndpointUriAssembler.java      |  7 +++----
 .../client/queue/AtomixQueueEndpointUriAssembler.java     |  7 +++----
 .../atomix/client/set/AtomixSetEndpointUriAssembler.java  |  7 +++----
 .../client/value/AtomixValueEndpointUriAssembler.java     |  7 +++----
 .../camel/component/avro/AvroEndpointUriAssembler.java    | 13 ++++++-------
 .../camel/component/aws/cw/CwEndpointUriAssembler.java    |  7 +++----
 .../camel/component/aws/ddb/DdbEndpointUriAssembler.java  |  7 +++----
 .../aws/ddbstream/DdbStreamEndpointUriAssembler.java      |  7 +++----
 .../camel/component/aws/ec2/EC2EndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/ecs/ECSEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/eks/EKSEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/iam/IAMEndpointUriAssembler.java  |  7 +++----
 .../aws/firehose/KinesisFirehoseEndpointUriAssembler.java |  7 +++----
 .../aws/kinesis/KinesisEndpointUriAssembler.java          |  7 +++----
 .../camel/component/aws/kms/KMSEndpointUriAssembler.java  |  7 +++----
 .../component/aws/lambda/LambdaEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/mq/MQEndpointUriAssembler.java    |  7 +++----
 .../camel/component/aws/msk/MSKEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/s3/S3EndpointUriAssembler.java    |  7 +++----
 .../camel/component/aws/sdb/SdbEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/ses/SesEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/sns/SnsEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/sqs/SqsEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/swf/SWFEndpointUriAssembler.java  |  7 +++----
 .../aws/translate/TranslateEndpointUriAssembler.java      |  7 +++----
 .../aws2/athena/Athena2EndpointUriAssembler.java          |  7 +++----
 .../camel/component/aws2/cw/Cw2EndpointUriAssembler.java  |  7 +++----
 .../component/aws2/ddb/Ddb2EndpointUriAssembler.java      |  7 +++----
 .../aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java    |  7 +++----
 .../component/aws2/ec2/AWS2EC2EndpointUriAssembler.java   |  7 +++----
 .../component/aws2/ecs/ECS2EndpointUriAssembler.java      |  7 +++----
 .../component/aws2/eks/EKS2EndpointUriAssembler.java      |  7 +++----
 .../aws2/eventbridge/EventbridgeEndpointUriAssembler.java |  7 +++----
 .../component/aws2/iam/IAM2EndpointUriAssembler.java      |  7 +++----
 .../firehose/KinesisFirehose2EndpointUriAssembler.java    |  7 +++----
 .../aws2/kinesis/Kinesis2EndpointUriAssembler.java        |  7 +++----
 .../component/aws2/kms/KMS2EndpointUriAssembler.java      |  7 +++----
 .../aws2/lambda/Lambda2EndpointUriAssembler.java          |  7 +++----
 .../camel/component/aws2/mq/MQ2EndpointUriAssembler.java  |  7 +++----
 .../component/aws2/msk/MSK2EndpointUriAssembler.java      |  7 +++----
 .../component/aws2/s3/AWS2S3EndpointUriAssembler.java     |  7 +++----
 .../component/aws2/ses/Ses2EndpointUriAssembler.java      |  7 +++----
 .../component/aws2/sns/Sns2EndpointUriAssembler.java      |  7 +++----
 .../component/aws2/sqs/Sqs2EndpointUriAssembler.java      |  7 +++----
 .../component/aws2/sts/STS2EndpointUriAssembler.java      |  7 +++----
 .../aws2/translate/Translate2EndpointUriAssembler.java    |  7 +++----
 .../azure/eventhubs/EventHubsEndpointUriAssembler.java    |  9 ++++-----
 .../azure/storage/blob/BlobEndpointUriAssembler.java      |  9 ++++-----
 .../azure/storage/queue/QueueEndpointUriAssembler.java    |  9 ++++-----
 .../azure/blob/BlobServiceEndpointUriAssembler.java       |  7 +++----
 .../azure/queue/QueueServiceEndpointUriAssembler.java     |  7 +++----
 .../bean/validator/BeanValidatorEndpointUriAssembler.java |  7 +++----
 .../camel/component/bean/BeanEndpointUriAssembler.java    |  7 +++----
 .../component/beanclass/ClassEndpointUriAssembler.java    |  7 +++----
 .../beanstalk/BeanstalkEndpointUriAssembler.java          |  7 +++----
 .../component/bonita/BonitaEndpointUriAssembler.java      |  7 +++----
 .../camel/component/box/BoxEndpointUriAssembler.java      |  9 ++++-----
 .../braintree/BraintreeEndpointUriAssembler.java          |  9 ++++-----
 .../component/browse/BrowseEndpointUriAssembler.java      |  7 +++----
 .../caffeine/cache/CaffeineCacheEndpointUriAssembler.java |  7 +++----
 .../load/CaffeineLoadCacheEndpointUriAssembler.java       |  7 +++----
 .../cassandra/CassandraEndpointUriAssembler.java          | 13 ++++++-------
 .../chatscript/ChatScriptEndpointUriAssembler.java        | 11 +++++------
 .../camel/component/chunk/ChunkEndpointUriAssembler.java  |  7 +++----
 .../apache/camel/component/cm/CMEndpointUriAssembler.java |  7 +++----
 .../camel/component/cmis/CMISEndpointUriAssembler.java    |  7 +++----
 .../org/apache/camel/coap/CoAPEndpointUriAssembler.java   |  7 +++----
 .../component/cometd/CometdEndpointUriAssembler.java      | 11 +++++------
 .../component/consul/ConsulEndpointUriAssembler.java      |  7 +++----
 .../controlbus/ControlBusEndpointUriAssembler.java        |  9 ++++-----
 .../camel/component/corda/CordaEndpointUriAssembler.java  |  7 +++----
 .../couchbase/CouchbaseEndpointUriAssembler.java          | 11 +++++------
 .../component/couchdb/CouchDbEndpointUriAssembler.java    | 13 ++++++-------
 .../camel/component/cron/CronEndpointUriAssembler.java    |  7 +++----
 .../crypto/cms/CryptoCmsEndpointUriAssembler.java         |  9 ++++-----
 .../crypto/DigitalSignatureEndpointUriAssembler.java      |  9 ++++-----
 .../camel/component/cxf/CxfEndpointUriAssembler.java      |  9 ++++-----
 .../component/cxf/jaxrs/CxfRsEndpointUriAssembler.java    |  9 ++++-----
 .../dataformat/DataFormatEndpointUriAssembler.java        |  9 ++++-----
 .../component/dataset/DataSetEndpointUriAssembler.java    |  7 +++----
 .../dataset/DataSetTestEndpointUriAssembler.java          |  7 +++----
 .../debezium/DebeziumMongodbEndpointUriAssembler.java     |  7 +++----
 .../debezium/DebeziumMySqlEndpointUriAssembler.java       |  7 +++----
 .../debezium/DebeziumPostgresEndpointUriAssembler.java    |  7 +++----
 .../debezium/DebeziumSqlserverEndpointUriAssembler.java   |  7 +++----
 .../digitalocean/DigitalOceanEndpointUriAssembler.java    |  7 +++----
 .../component/direct/DirectEndpointUriAssembler.java      |  7 +++----
 .../component/directvm/DirectVmEndpointUriAssembler.java  |  7 +++----
 .../disruptor/DisruptorEndpointUriAssembler.java          |  7 +++----
 .../disruptor/vm/DisruptorVmEndpointUriAssembler.java     |  7 +++----
 .../camel/component/djl/DJLEndpointUriAssembler.java      |  7 +++----
 .../camel/component/dns/DnsEndpointUriAssembler.java      |  7 +++----
 .../component/docker/DockerEndpointUriAssembler.java      |  7 +++----
 .../camel/component/dozer/DozerEndpointUriAssembler.java  |  7 +++----
 .../camel/component/drill/DrillEndpointUriAssembler.java  |  7 +++----
 .../component/dropbox/DropboxEndpointUriAssembler.java    |  7 +++----
 .../component/ehcache/EhcacheEndpointUriAssembler.java    |  7 +++----
 .../elasticsearch/ElasticsearchEndpointUriAssembler.java  |  7 +++----
 .../camel/component/elsql/ElsqlEndpointUriAssembler.java  |  9 ++++-----
 .../component/etcd/EtcdKeysEndpointUriAssembler.java      |  7 +++----
 .../component/etcd/EtcdStatsEndpointUriAssembler.java     |  7 +++----
 .../component/etcd/EtcdWatchEndpointUriAssembler.java     |  7 +++----
 .../camel/component/exec/ExecEndpointUriAssembler.java    |  7 +++----
 .../component/facebook/FacebookEndpointUriAssembler.java  |  7 +++----
 .../camel/component/fhir/FhirEndpointUriAssembler.java    |  9 ++++-----
 .../file/watch/FileWatchEndpointUriAssembler.java         |  7 +++----
 .../camel/component/file/FileEndpointUriAssembler.java    |  7 +++----
 .../component/flatpack/FlatpackEndpointUriAssembler.java  |  9 ++++-----
 .../camel/component/flink/FlinkEndpointUriAssembler.java  |  7 +++----
 .../camel/component/fop/FopEndpointUriAssembler.java      |  7 +++----
 .../freemarker/FreemarkerEndpointUriAssembler.java        |  7 +++----
 .../component/file/remote/FtpEndpointUriAssembler.java    | 11 +++++------
 .../component/file/remote/FtpsEndpointUriAssembler.java   | 11 +++++------
 .../component/file/remote/SftpEndpointUriAssembler.java   | 11 +++++------
 .../component/ganglia/GangliaEndpointUriAssembler.java    |  9 ++++-----
 .../component/geocoder/GeoCoderEndpointUriAssembler.java  |  9 ++++-----
 .../camel/component/git/GitEndpointUriAssembler.java      |  7 +++----
 .../component/github/GitHubEndpointUriAssembler.java      |  9 ++++-----
 .../bigquery/GoogleBigQueryEndpointUriAssembler.java      | 11 +++++------
 .../sql/GoogleBigQuerySQLEndpointUriAssembler.java        |  9 ++++-----
 .../calendar/GoogleCalendarEndpointUriAssembler.java      |  9 ++++-----
 .../stream/GoogleCalendarStreamEndpointUriAssembler.java  |  7 +++----
 .../google/drive/GoogleDriveEndpointUriAssembler.java     |  9 ++++-----
 .../google/mail/GoogleMailEndpointUriAssembler.java       |  9 ++++-----
 .../mail/stream/GoogleMailStreamEndpointUriAssembler.java |  7 +++----
 .../google/pubsub/GooglePubsubEndpointUriAssembler.java   |  9 ++++-----
 .../google/sheets/GoogleSheetsEndpointUriAssembler.java   |  9 ++++-----
 .../stream/GoogleSheetsStreamEndpointUriAssembler.java    |  7 +++----
 .../camel/component/gora/GoraEndpointUriAssembler.java    |  7 +++----
 .../camel/component/grape/GrapeEndpointUriAssembler.java  |  7 +++----
 .../component/graphql/GraphqlEndpointUriAssembler.java    |  7 +++----
 .../camel/component/grpc/GrpcEndpointUriAssembler.java    | 11 +++++------
 .../guava/eventbus/GuavaEventBusEndpointUriAssembler.java |  7 +++----
 .../HazelcastAtomicnumberEndpointUriAssembler.java        |  7 +++----
 .../instance/HazelcastInstanceEndpointUriAssembler.java   |  7 +++----
 .../hazelcast/list/HazelcastListEndpointUriAssembler.java |  7 +++----
 .../hazelcast/map/HazelcastMapEndpointUriAssembler.java   |  7 +++----
 .../multimap/HazelcastMultimapEndpointUriAssembler.java   |  7 +++----
 .../queue/HazelcastQueueEndpointUriAssembler.java         |  7 +++----
 .../HazelcastReplicatedmapEndpointUriAssembler.java       |  7 +++----
 .../HazelcastRingbufferEndpointUriAssembler.java          |  7 +++----
 .../hazelcast/seda/HazelcastSedaEndpointUriAssembler.java |  7 +++----
 .../hazelcast/set/HazelcastSetEndpointUriAssembler.java   |  7 +++----
 .../topic/HazelcastTopicEndpointUriAssembler.java         |  7 +++----
 .../camel/component/hbase/HBaseEndpointUriAssembler.java  |  7 +++----
 .../camel/component/hdfs/HdfsEndpointUriAssembler.java    | 11 +++++------
 .../component/hipchat/HipchatEndpointUriAssembler.java    | 11 +++++------
 .../camel/component/http/HttpEndpointUriAssembler.java    |  7 +++----
 .../iec60870/client/ClientEndpointUriAssembler.java       |  7 +++----
 .../iec60870/server/ServerEndpointUriAssembler.java       |  7 +++----
 .../infinispan/InfinispanEndpointUriAssembler.java        |  7 +++----
 .../component/influxdb/InfluxDbEndpointUriAssembler.java  |  7 +++----
 .../camel/component/iota/IOTAEndpointUriAssembler.java    |  7 +++----
 .../camel/component/ipfs/IPFSEndpointUriAssembler.java    |  7 +++----
 .../camel/component/irc/IrcEndpointUriAssembler.java      |  9 ++++-----
 .../component/ironmq/IronMQEndpointUriAssembler.java      |  7 +++----
 .../camel/component/jbpm/JBPMEndpointUriAssembler.java    |  9 ++++-----
 .../component/jcache/JCacheEndpointUriAssembler.java      |  7 +++----
 .../component/jclouds/JcloudsEndpointUriAssembler.java    |  9 ++++-----
 .../camel/component/jcr/JcrEndpointUriAssembler.java      |  9 ++++-----
 .../camel/component/jdbc/JdbcEndpointUriAssembler.java    |  7 +++----
 .../component/jetty9/JettyHttp9EndpointUriAssembler.java  |  7 +++----
 .../jgroups/raft/JGroupsRaftEndpointUriAssembler.java     |  7 +++----
 .../component/jgroups/JGroupsEndpointUriAssembler.java    |  7 +++----
 .../validator/jing/JingEndpointUriAssembler.java          |  7 +++----
 .../camel/component/jira/JiraEndpointUriAssembler.java    |  7 +++----
 .../camel/component/jms/JmsEndpointUriAssembler.java      |  9 ++++-----
 .../camel/component/jmx/JMXEndpointUriAssembler.java      |  7 +++----
 .../camel/component/jolt/JoltEndpointUriAssembler.java    |  7 +++----
 .../camel/component/jooq/JooqEndpointUriAssembler.java    |  7 +++----
 .../camel/component/jpa/JpaEndpointUriAssembler.java      |  7 +++----
 .../camel/component/scp/ScpEndpointUriAssembler.java      | 11 +++++------
 .../camel/component/jslt/JsltEndpointUriAssembler.java    |  7 +++----
 .../jsonvalidator/JsonValidatorEndpointUriAssembler.java  |  7 +++----
 .../component/jsonata/JsonataEndpointUriAssembler.java    |  7 +++----
 .../camel/component/jt400/Jt400EndpointUriAssembler.java  | 15 +++++++--------
 .../camel/component/kafka/KafkaEndpointUriAssembler.java  |  7 +++----
 .../KubernetesConfigMapsEndpointUriAssembler.java         |  7 +++----
 .../KubernetesDeploymentsEndpointUriAssembler.java        |  7 +++----
 .../kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java |  7 +++----
 .../kubernetes/job/KubernetesJobEndpointUriAssembler.java |  7 +++----
 .../KubernetesNamespacesEndpointUriAssembler.java         |  7 +++----
 .../nodes/KubernetesNodesEndpointUriAssembler.java        |  7 +++----
 .../KubernetesPersistentVolumesEndpointUriAssembler.java  |  7 +++----
 ...rnetesPersistentVolumesClaimsEndpointUriAssembler.java |  7 +++----
 .../pods/KubernetesPodsEndpointUriAssembler.java          |  7 +++----
 ...ernetesReplicationControllersEndpointUriAssembler.java |  7 +++----
 .../KubernetesResourcesQuotaEndpointUriAssembler.java     |  7 +++----
 .../secrets/KubernetesSecretsEndpointUriAssembler.java    |  7 +++----
 .../KubernetesServiceAccountsEndpointUriAssembler.java    |  7 +++----
 .../services/KubernetesServicesEndpointUriAssembler.java  |  7 +++----
 .../OpenshiftBuildConfigsEndpointUriAssembler.java        |  7 +++----
 .../builds/OpenshiftBuildsEndpointUriAssembler.java       |  7 +++----
 .../camel/component/kudu/KuduEndpointUriAssembler.java    | 11 +++++------
 .../component/language/LanguageEndpointUriAssembler.java  |  9 ++++-----
 .../camel/component/ldap/LdapEndpointUriAssembler.java    |  7 +++----
 .../camel/component/ldif/LdifEndpointUriAssembler.java    |  7 +++----
 .../camel/component/log/LogEndpointUriAssembler.java      |  7 +++----
 .../component/lucene/LuceneEndpointUriAssembler.java      |  9 ++++-----
 .../lumberjack/LumberjackEndpointUriAssembler.java        |  9 ++++-----
 .../camel/component/mail/MailEndpointUriAssembler.java    |  9 ++++-----
 .../component/master/MasterEndpointUriAssembler.java      |  9 ++++-----
 .../component/metrics/MetricsEndpointUriAssembler.java    |  9 ++++-----
 .../micrometer/MicrometerEndpointUriAssembler.java        | 11 +++++------
 .../metrics/MicroProfileMetricsEndpointUriAssembler.java  |  9 ++++-----
 .../milo/client/MiloClientEndpointUriAssembler.java       |  7 +++----
 .../milo/server/MiloServerEndpointUriAssembler.java       |  7 +++----
 .../camel/component/mina/MinaEndpointUriAssembler.java    | 11 +++++------
 .../camel/component/minio/MinioEndpointUriAssembler.java  |  7 +++----
 .../camel/component/mllp/MllpEndpointUriAssembler.java    |  9 ++++-----
 .../camel/component/mock/MockEndpointUriAssembler.java    |  7 +++----
 .../mongodb/gridfs/GridFsEndpointUriAssembler.java        |  7 +++----
 .../component/mongodb/MongoDbEndpointUriAssembler.java    |  7 +++----
 .../component/validator/msv/MsvEndpointUriAssembler.java  |  7 +++----
 .../component/mustache/MustacheEndpointUriAssembler.java  |  7 +++----
 .../camel/component/mvel/MvelEndpointUriAssembler.java    |  7 +++----
 .../mybatis/MyBatisBeanEndpointUriAssembler.java          |  9 ++++-----
 .../component/mybatis/MyBatisEndpointUriAssembler.java    |  7 +++----
 .../component/nagios/NagiosEndpointUriAssembler.java      |  9 ++++-----
 .../camel/component/nats/NatsEndpointUriAssembler.java    |  7 +++----
 .../netty/http/NettyHttpEndpointUriAssembler.java         | 13 ++++++-------
 .../netty/http/NettyHttpEndpointUriAssemblerTest.java     | 10 +++++-----
 .../camel/component/netty/NettyEndpointUriAssembler.java  | 11 +++++------
 .../component/nitrite/NitriteEndpointUriAssembler.java    |  7 +++----
 .../camel/component/nsq/NsqEndpointUriAssembler.java      |  7 +++----
 .../oaipmh/component/OAIPMHEndpointUriAssembler.java      |  7 +++----
 .../component/olingo2/Olingo2EndpointUriAssembler.java    |  9 ++++-----
 .../component/olingo4/Olingo4EndpointUriAssembler.java    |  9 ++++-----
 .../openstack/cinder/CinderEndpointUriAssembler.java      |  7 +++----
 .../openstack/glance/GlanceEndpointUriAssembler.java      |  7 +++----
 .../openstack/keystone/KeystoneEndpointUriAssembler.java  |  7 +++----
 .../openstack/neutron/NeutronEndpointUriAssembler.java    |  7 +++----
 .../openstack/nova/NovaEndpointUriAssembler.java          |  7 +++----
 .../openstack/swift/SwiftEndpointUriAssembler.java        |  7 +++----
 .../optaplanner/OptaPlannerEndpointUriAssembler.java      |  7 +++----
 .../camel/component/paho/PahoEndpointUriAssembler.java    |  7 +++----
 .../camel/component/pdf/PdfEndpointUriAssembler.java      |  7 +++----
 .../slot/PgReplicationSlotEndpointUriAssembler.java       | 15 +++++++--------
 .../component/pgevent/PgEventEndpointUriAssembler.java    | 13 ++++++-------
 .../platform/http/PlatformHttpEndpointUriAssembler.java   |  7 +++----
 .../component/printer/PrinterEndpointUriAssembler.java    | 11 +++++------
 .../component/pubnub/PubNubEndpointUriAssembler.java      |  7 +++----
 .../component/pulsar/PulsarEndpointUriAssembler.java      | 13 ++++++-------
 .../component/quartz/QuartzEndpointUriAssembler.java      |  9 ++++-----
 .../quickfixj/QuickfixjEndpointUriAssembler.java          |  7 +++----
 .../component/rabbitmq/RabbitMQEndpointUriAssembler.java  |  7 +++----
 .../streams/ReactiveStreamsEndpointUriAssembler.java      |  7 +++----
 .../camel/component/ref/RefEndpointUriAssembler.java      |  7 +++----
 .../rest/openapi/RestOpenApiEndpointUriAssembler.java     |  9 ++++-----
 .../rest/swagger/RestSwaggerEndpointUriAssembler.java     |  9 ++++-----
 .../camel/component/rest/RestApiEndpointUriAssembler.java |  9 ++++-----
 .../camel/component/rest/RestEndpointUriAssembler.java    | 11 +++++------
 .../component/resteasy/ResteasyEndpointUriAssembler.java  |  7 +++----
 .../RobotFrameworkEndpointUriAssembler.java               |  7 +++----
 .../camel/component/rss/RssEndpointUriAssembler.java      |  7 +++----
 .../camel/component/saga/SagaEndpointUriAssembler.java    |  7 +++----
 .../salesforce/SalesforceEndpointUriAssembler.java        |  9 ++++-----
 .../sap/netweaver/NetWeaverEndpointUriAssembler.java      |  7 +++----
 .../component/xquery/XQueryEndpointUriAssembler.java      |  7 +++----
 .../scheduler/SchedulerEndpointUriAssembler.java          |  7 +++----
 .../schematron/SchematronEndpointUriAssembler.java        |  7 +++----
 .../camel/component/seda/SedaEndpointUriAssembler.java    |  7 +++----
 .../component/service/ServiceEndpointUriAssembler.java    |  7 +++----
 .../servicenow/ServiceNowEndpointUriAssembler.java        |  7 +++----
 .../component/servlet/ServletEndpointUriAssembler.java    |  7 +++----
 .../camel/component/sip/SipEndpointUriAssembler.java      |  7 +++----
 .../camel/component/sjms/SjmsEndpointUriAssembler.java    |  9 ++++-----
 .../sjms/batch/SjmsBatchEndpointUriAssembler.java         |  7 +++----
 .../camel/component/sjms2/Sjms2EndpointUriAssembler.java  |  9 ++++-----
 .../camel/component/slack/SlackEndpointUriAssembler.java  |  7 +++----
 .../camel/component/smpp/SmppEndpointUriAssembler.java    |  9 ++++-----
 .../camel/component/snmp/SnmpEndpointUriAssembler.java    |  9 ++++-----
 .../camel/component/solr/SolrEndpointUriAssembler.java    |  7 +++----
 .../component/SoroushBotEndpointUriAssembler.java         |  7 +++----
 .../camel/component/spark/SparkEndpointUriAssembler.java  |  7 +++----
 .../splunkhec/SplunkHECEndpointUriAssembler.java          |  9 ++++-----
 .../component/splunk/SplunkEndpointUriAssembler.java      |  7 +++----
 .../spring/batch/SpringBatchEndpointUriAssembler.java     |  7 +++----
 .../SpringIntegrationEndpointUriAssembler.java            |  7 +++----
 .../springldap/SpringLdapEndpointUriAssembler.java        |  7 +++----
 .../camel/component/redis/RedisEndpointUriAssembler.java  |  9 ++++-----
 .../spring/ws/SpringWebserviceEndpointUriAssembler.java   | 13 ++++++-------
 .../camel/component/event/EventEndpointUriAssembler.java  |  7 +++----
 .../camel/component/sql/SqlEndpointUriAssembler.java      |  7 +++----
 .../sql/stored/SqlStoredEndpointUriAssembler.java         |  7 +++----
 .../camel/component/ssh/SshEndpointUriAssembler.java      |  9 ++++-----
 .../camel/component/stax/StAXEndpointUriAssembler.java    |  7 +++----
 .../camel/component/stomp/StompEndpointUriAssembler.java  |  7 +++----
 .../component/stream/StreamEndpointUriAssembler.java      |  7 +++----
 .../StringTemplateEndpointUriAssembler.java               |  7 +++----
 .../camel/component/stub/StubEndpointUriAssembler.java    |  7 +++----
 .../component/telegram/TelegramEndpointUriAssembler.java  |  7 +++----
 .../component/thrift/ThriftEndpointUriAssembler.java      | 11 +++++------
 .../camel/component/tika/TikaEndpointUriAssembler.java    |  7 +++----
 .../camel/component/timer/TimerEndpointUriAssembler.java  |  7 +++----
 .../component/twilio/TwilioEndpointUriAssembler.java      |  9 ++++-----
 .../TwitterDirectMessageEndpointUriAssembler.java         |  7 +++----
 .../twitter/search/TwitterSearchEndpointUriAssembler.java |  7 +++----
 .../timeline/TwitterTimelineEndpointUriAssembler.java     |  7 +++----
 .../component/undertow/UndertowEndpointUriAssembler.java  |  7 +++----
 .../validator/ValidatorEndpointUriAssembler.java          |  7 +++----
 .../component/velocity/VelocityEndpointUriAssembler.java  |  7 +++----
 .../vertx/http/VertxHttpEndpointUriAssembler.java         |  7 +++----
 .../websocket/VertxWebsocketEndpointUriAssembler.java     | 11 +++++------
 .../camel/component/vertx/VertxEndpointUriAssembler.java  |  7 +++----
 .../apache/camel/component/vm/VmEndpointUriAssembler.java |  7 +++----
 .../component/weather/WeatherEndpointUriAssembler.java    |  7 +++----
 .../camel/component/web3j/Web3jEndpointUriAssembler.java  |  7 +++----
 .../component/webhook/WebhookEndpointUriAssembler.java    |  7 +++----
 .../jsr356/JSR356WebSocketEndpointUriAssembler.java       |  7 +++----
 .../websocket/WebsocketEndpointUriAssembler.java          | 11 +++++------
 .../camel/component/weka/WekaEndpointUriAssembler.java    |  7 +++----
 .../wordpress/WordpressEndpointUriAssembler.java          |  9 ++++-----
 .../component/workday/WorkdayEndpointUriAssembler.java    |  9 ++++-----
 .../component/xchange/XChangeEndpointUriAssembler.java    |  7 +++----
 .../apache/camel/component/xj/XJEndpointUriAssembler.java |  7 +++----
 .../xmlsecurity/XmlSignerEndpointUriAssembler.java        |  7 +++----
 .../xmlsecurity/XmlVerifierEndpointUriAssembler.java      |  7 +++----
 .../camel/component/xmpp/XmppEndpointUriAssembler.java    | 11 +++++------
 .../xslt/saxon/XsltSaxonEndpointUriAssembler.java         |  7 +++----
 .../camel/component/xslt/XsltEndpointUriAssembler.java    |  7 +++----
 .../component/yammer/YammerEndpointUriAssembler.java      |  7 +++----
 .../component/zendesk/ZendeskEndpointUriAssembler.java    |  7 +++----
 .../zookeepermaster/MasterEndpointUriAssembler.java       |  9 ++++-----
 .../zookeeper/ZooKeeperEndpointUriAssembler.java          |  9 ++++-----
 338 files changed, 1148 insertions(+), 1485 deletions(-)

diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java
index cc4d7d2..f4af9dd 100644
--- a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class ActiveMQEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java
index 4f39303..59c22d1 100644
--- a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java
+++ b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class WsEndpointUriAssembler extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
index f1fc2f1..e259d0e 100644
--- a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
+++ b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AhcEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java
index 5d55534..5fb9cef 100644
--- a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java
+++ b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class AMQPEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java
index e7813dd..bbba4aa 100644
--- a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java
+++ b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ApnsEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java
index be54ee0..aa02bdc 100644
--- a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java
+++ b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ArangoDbEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java
index 3f19636..976026a 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class AS2EndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java
index 037a116..3b0f7f4 100644
--- a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java
+++ b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AsteriskEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java
index a59d0f3..8639147 100644
--- a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java
+++ b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class AtmosEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java
index 34f4da9..a27f171 100644
--- a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java
+++ b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class WebsocketEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "servicePath", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "servicePath", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java
index 9cf783a..bf8073f 100644
--- a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java
+++ b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "feedUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "feedUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java
index ecb8ce6..ba8db28 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixMapEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java
index a7d05ad..de5438a 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixMessagingEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java
index 0cbe273..231d8a1 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixMultiMapEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java
index cb9e32b..20adcd9 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixQueueEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java
index 7c50246..98a92e3 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixSetEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java
index 4408526..415d18e 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixValueEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java
index 34269d7..b48b4bb 100644
--- a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java
+++ b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class AvroEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "transport", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "messageName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "transport", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "messageName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java
index c009450..1ad8bc5 100644
--- a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java
+++ b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CwEndpointUriAssembler extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java
index f282dc8..7baa28f 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DdbEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java
index 5d1bfe1..6901a96 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DdbStreamEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java
index 4a92ad5..5b4327b 100644
--- a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java
+++ b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EC2EndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java
index a83dd6f..e3ceb37 100644
--- a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java
+++ b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ECSEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java
index c0baa5f..ffefd0e 100644
--- a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java
+++ b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EKSEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java
index 4eb5800..1ec46c5 100644
--- a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java
+++ b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class IAMEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java
index 5a639ee..f6d681d 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KinesisFirehoseEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java
index 784685b..da4468a 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KinesisEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java
index caef2ad..e9d39a1 100644
--- a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java
+++ b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KMSEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java
index dc8b80d..18c219f 100644
--- a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java
+++ b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class LambdaEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "function", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java
index aeaa610..537c8fe 100644
--- a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java
+++ b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MQEndpointUriAssembler extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java
index 464b523..5c721ae 100644
--- a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java
+++ b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MSKEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java
index eacb7d9..acdb5c8 100644
--- a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java
+++ b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class S3EndpointUriAssembler extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "bucketNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java
index fb3e745..3363d4d 100644
--- a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java
+++ b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SdbEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "domainName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "domainName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java
index 924b4e8..3edf071 100644
--- a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java
+++ b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SesEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "from", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java
index 640c896..a7a147f 100644
--- a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java
+++ b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SnsEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topicNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java
index f350cfd..d06b3ec 100644
--- a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java
+++ b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SqsEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "queueNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java
index 8d8028b..59c13b2 100644
--- a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java
+++ b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SWFEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java
index 863cd4e..6ce19aa 100644
--- a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java
+++ b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TranslateEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java
index 0d42591..cfe4a58 100644
--- a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java
+++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Athena2EndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java
index df65548..39cdcd8 100644
--- a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java
+++ b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Cw2EndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java
index a68bd50..54d442f 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Ddb2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java
index 406760a..63989fa 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Ddb2StreamEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java
index f7037d8..b9f81a5 100644
--- a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java
+++ b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AWS2EC2EndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java
index 12ee54a..85227c4 100644
--- a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java
+++ b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ECS2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java
index dbdc5e0..5eaf045 100644
--- a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java
+++ b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EKS2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
index 1414940..bd0edf2 100644
--- a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
+++ b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EventbridgeEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "eventbusNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "eventbusNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java
index fb79b78..342092b 100644
--- a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java
+++ b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class IAM2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java
index 8a30a5e..f6fbaa7 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KinesisFirehose2EndpointUriAssembler extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java
index 4db49ad..84a2137 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Kinesis2EndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java
index f90d86879..99c4fca 100644
--- a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java
+++ b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KMS2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java
index ede2c1c..f538530 100644
--- a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java
+++ b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Lambda2EndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "function", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java
index 1d09ffd..fd63e22 100644
--- a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java
+++ b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MQ2EndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java
index 5ebb783..a9094e9 100644
--- a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java
+++ b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MSK2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java
index f0d4d05..5d6b83d 100644
--- a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java
+++ b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AWS2S3EndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "bucketNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java
index 7c7df70..a1224a9 100644
--- a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java
+++ b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Ses2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "from", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java
index 1db411f..64b8a50 100644
--- a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Sns2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topicNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java
index f83c79c..b723d14 100644
--- a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java
+++ b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Sqs2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "queueNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java
index 653a84f..1bdf770 100644
--- a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java
+++ b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class STS2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java
index 6c69084..f5167f4 100644
--- a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java
+++ b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Translate2EndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java
index 648518a..186fde1 100644
--- a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java
+++ b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class EventHubsEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "eventHubName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "namespace", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "eventHubName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java
index da89721..23b13d7 100644
--- a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java
+++ b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class BlobEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "accountName", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "containerName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "accountName", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "containerName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java
index 0d59393..e07b51a 100644
--- a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java
+++ b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class QueueEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "accountName", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "accountName", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "queueName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java
index 52465c2..97d5514 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BlobServiceEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "containerOrBlobUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "containerOrBlobUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java
index 6ccc7e9..285b1ca 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class QueueServiceEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "containerAndQueueUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "containerAndQueueUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java
index 540328d..812b716 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BeanValidatorEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java
index 2e25661..dbb093f 100644
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BeanEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java
index e23779f..15ee8c2 100644
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ClassEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java
index ffd0839..674aa16 100644
--- a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java
+++ b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BeanstalkEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionSettings", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "connectionSettings", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java
index 303cab7..1a26407 100644
--- a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java
+++ b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BonitaEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java
index 505b08e..4a992a0 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class BoxEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java
index 7e252a0..7851114 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class BraintreeEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java b/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java
index d9852da..ff0f401 100644
--- a/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java
+++ b/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BrowseEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java
index 59ed359..d1d412b 100644
--- a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java
+++ b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CaffeineCacheEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java
index 1c9ab37..c4a4c93 100644
--- a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java
+++ b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CaffeineLoadCacheEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java b/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java
index ad0c8da..609d9d6 100644
--- a/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java
+++ b/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class CassandraEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanRef", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "hosts", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "keyspace", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "beanRef", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "hosts", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "keyspace", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java b/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java
index a10f8a4..89cfd6c 100644
--- a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java
+++ b/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class ChatScriptEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "1024", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "botName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "1024", false, copy);
+        uri = buildPathParameter(syntax, uri, "botName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java b/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java
index 3635df9..8e6ba17 100644
--- a/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java
+++ b/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ChunkEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java b/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java
index 908cdc2..4858aa7 100644
--- a/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java
+++ b/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CMEndpointUriAssembler extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java b/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java
index 7afade4..ed65396 100644
--- a/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java
+++ b/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CMISEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cmsUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cmsUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java b/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java
index c24f284..ea4749b 100644
--- a/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java
+++ b/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class CoAPEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "uri", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java b/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java
index 44a0f5a..c507424 100644
--- a/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java
+++ b/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,16 +26,16 @@ public class CometdEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "channelName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "channelName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java
index 12c9ff5..3f2ea51 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ConsulEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiEndpoint", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiEndpoint", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java b/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java
index bb26fae..87e9707 100644
--- a/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java
+++ b/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class ControlBusEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "language", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "command", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "language", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java
index cdcdb11..6a93dbb 100644
--- a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java
+++ b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CordaEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "node", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "node", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java
index 8c516cd..2adeea4 100644
--- a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java
+++ b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class CouchbaseEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8091", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "8091", false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java b/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java
index 0450ab1..d8fa528 100644
--- a/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java
+++ b/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class CouchDbEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5984", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "5984", false, copy);
+        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java b/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java
index 874a323..d725d9d 100644
--- a/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java
+++ b/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CronEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java
index 284d05c..2708f70 100644
--- a/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java
+++ b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class CryptoCmsEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cryptoOperation", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cryptoOperation", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java
index 535c5c0..57a4412 100644
--- a/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java
+++ b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class DigitalSignatureEndpointUriAssembler extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cryptoOperation", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cryptoOperation", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java
index 9956a0e..099dcd0 100644
--- a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java
+++ b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class CxfEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanId", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "beanId", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "address", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java
index 564cc13..61dac40 100644
--- a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java
+++ b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class CxfRsEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanId", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "beanId", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "address", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java b/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java
index 527347b..cdf7d0e 100644
--- a/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java
+++ b/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class DataFormatEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java
index f7091a2..e4a6d0a 100644
--- a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java
+++ b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DataSetEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java
index 3e6d813..147aafa 100644
--- a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java
+++ b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DataSetTestEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java
index f7fd574..3a65791 100644
--- a/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java
+++ b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DebeziumMongodbEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java
index 39a39ec..0bdf7b6 100644
--- a/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java
+++ b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DebeziumMySqlEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java
index a7176c8..4ffad3e 100644
--- a/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java
+++ b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DebeziumPostgresEndpointUriAssembler extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java
index da59ea3..21569e7 100644
--- a/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java
+++ b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DebeziumSqlserverEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java b/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java
index 8b183cf..c51cbcc 100644
--- a/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java
+++ b/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DigitalOceanEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java b/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java
index d6f0b3f..37a34f7 100644
--- a/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java
+++ b/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DirectEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java b/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java
index 3b632d5..c8b2b38 100644
--- a/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java
+++ b/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DirectVmEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java
index 134bac2..c973e3a 100644
--- a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java
+++ b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class DisruptorEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java
index 3e9ebb303..a4c610b 100644
--- a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java
+++ b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class DisruptorVmEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java b/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java
index 1d099d3..9f69c00 100644
--- a/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java
+++ b/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DJLEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "application", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "application", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java b/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java
index 99e2443..1b32901 100644
--- a/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java
+++ b/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DnsEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "dnsType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "dnsType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java b/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java
index 016ad4d..7114037 100644
--- a/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java
+++ b/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DockerEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java b/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java
index 7c8071c..516850a 100644
--- a/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java
+++ b/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DozerEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java b/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java
index 647a64b..4471a17 100644
--- a/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java
+++ b/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DrillEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java b/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java
index 2838407..928da7a 100644
--- a/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java
+++ b/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DropboxEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java b/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java
index f486280..85ae5e4 100644
--- a/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java
+++ b/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EhcacheEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java b/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java
index 6cc6ff2..6a1ed44 100644
--- a/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java
+++ b/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ElasticsearchEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java
index 50390d1..51d23a9 100644
--- a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java
+++ b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class ElsqlEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "elsqlName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "elsqlName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java
index eeb29f4..4108534 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EtcdKeysEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java
index 0c31af7..35caf3c 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EtcdStatsEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java
index de1fd22..58aa28f 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EtcdWatchEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java b/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java
index c631646..1b4d824 100644
--- a/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java
+++ b/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ExecEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "executable", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "executable", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java b/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java
index 8ba4a95..52c14e0 100644
--- a/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java
+++ b/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FacebookEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java
index 0ab3b63..77ff307 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class FhirEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java b/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java
index d79a31d..8ca9a9f 100644
--- a/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java
+++ b/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FileWatchEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java b/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java
index 84d0015..d06e0ff 100644
--- a/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java
+++ b/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FileEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "directoryName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java
index 75ef7e9..2187f46 100644
--- a/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java
+++ b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class FlatpackEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", "delim", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", "delim", false, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java b/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java
index f56f5ba..f06abbb 100644
--- a/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java
+++ b/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FlinkEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "endpointType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "endpointType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java b/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java
index 7f0f52f..78d3d4d 100644
--- a/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java
+++ b/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FopEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "outputType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "outputType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java b/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java
index fd2625e..b46a3e6 100644
--- a/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java
+++ b/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FreemarkerEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java
index dc27045..0fedc33 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class FtpEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java
index d288c97..36f7a12 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class FtpsEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java
index db02b43..26ae39c 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class SftpEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java b/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java
index b6cec0f..c6b5ed0 100644
--- a/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java
+++ b/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GangliaEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "239.2.11.71", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8649", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", "239.2.11.71", false, copy);
+        uri = buildPathParameter(syntax, uri, "port", "8649", false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java b/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java
index 8122958..270ee7e 100644
--- a/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java
+++ b/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GeoCoderEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "latlng", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "address", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "latlng", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java b/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java
index a3e2c53..74cf2dd 100644
--- a/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java
+++ b/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GitEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "localPath", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "localPath", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java b/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java
index ae91997..3490f05 100644
--- a/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java
+++ b/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GitHubEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "branchName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "branchName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java
index 3121723..1f8261b 100644
--- a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java
+++ b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class GoogleBigQueryEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "datasetId", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "tableId", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "projectId", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "datasetId", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "tableId", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java
index b2987b7..78fd6fe 100644
--- a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java
+++ b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GoogleBigQuerySQLEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "query", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "query", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "projectId", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java
index 0ab9542..c2ec648 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GoogleCalendarEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java
index 33aeb49..cfd0c56 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GoogleCalendarStreamEndpointUriAssembler extends org.apache.camel.s
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "index", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java
index bc41f74..4463d27 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GoogleDriveEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java
index 79e9b9a..f98abab 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GoogleMailEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java
index 4b1a5a9..df7fce6 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GoogleMailStreamEndpointUriAssembler extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "index", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java b/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java
index 1d7dc47..6d14b02 100644
--- a/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java
+++ b/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GooglePubsubEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "projectId", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java
index 0c5b698..ba8cd3b 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GoogleSheetsEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java
index f7c9098..99c4966 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GoogleSheetsStreamEndpointUriAssembler extends org.apache.camel.sup
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java b/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java
index e3cecb0..11976ab 100644
--- a/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java
+++ b/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GoraEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java b/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java
index 672ace8..70a7dce 100644
--- a/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java
+++ b/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GrapeEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "defaultCoordinates", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "defaultCoordinates", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java b/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java
index ae1722f..be87571 100644
--- a/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java
+++ b/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GraphqlEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java b/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java
index 4a6fa27..aabe639 100644
--- a/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java
+++ b/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class GrpcEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "service", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "service", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java b/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java
index a1edf93..d73b44f 100644
--- a/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java
+++ b/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GuavaEventBusEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "eventBusRef", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "eventBusRef", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java
index 6c3c8a2..1822683 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastAtomicnumberEndpointUriAssembler extends org.apache.camel.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java
index 63636bc..c0f752b 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastInstanceEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java
index 180614d..41d7836 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastListEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java
index e417fc9..c62e1be 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastMapEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java
index 6f8a75b..5faf993 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastMultimapEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java
index 0d67980..d07281a 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastQueueEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java
index 160b0fc..89213cc 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastReplicatedmapEndpointUriAssembler extends org.apache.camel
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java
index 6bf40d6..d77ef9c 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastRingbufferEndpointUriAssembler extends org.apache.camel.su
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java
index 5d7f29c..9261cdd 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastSedaEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java
index efca588..4dc6d76 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastSetEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java
index 88e1560..e360ed9 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastTopicEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java b/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java
index 1c204e5..c3c2a41 100644
--- a/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java
+++ b/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HBaseEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java b/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java
index bbe13c2..dae686a 100644
--- a/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java
+++ b/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class HdfsEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8020", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "hostName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "8020", false, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java b/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java
index 01f709f..04037c8 100644
--- a/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java
+++ b/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class HipchatEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "80", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "80", false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java
index dca687c..dea96c2 100644
--- a/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java
+++ b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class HttpEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java
index 71fa776..be1825a 100644
--- a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java
+++ b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ClientEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "uriPath", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java
index 4d6ea3d..6a6b1b3 100644
--- a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java
+++ b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ServerEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "uriPath", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java b/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java
index f556548..3f1b2f9 100644
--- a/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java
+++ b/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class InfinispanEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java b/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java
index c5c9a4e..75669ad 100644
--- a/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java
+++ b/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class InfluxDbEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java b/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java
index 5058e28..921b755 100644
--- a/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java
+++ b/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class IOTAEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java b/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java
index e7ced83..6a101af 100644
--- a/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java
+++ b/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class IPFSEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "ipfsCmd", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "ipfsCmd", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java b/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java
index 8662018..1898d06 100644
--- a/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java
+++ b/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class IrcEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java b/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java
index dfb68d9..905ba17 100644
--- a/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java
+++ b/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class IronMQEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "queueName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java b/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java
index 72daebd..4073171 100644
--- a/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java
+++ b/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class JBPMEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionURL", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "eventListenerType", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "connectionURL", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "eventListenerType", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java b/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java
index 83e25de..0c64cff 100644
--- a/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java
+++ b/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JCacheEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java b/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java
index 16ac847..fb67e72 100644
--- a/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java
+++ b/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class JcloudsEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "providerId", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "command", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "providerId", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java b/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java
index 3dee544..dbb4ced 100644
--- a/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java
+++ b/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class JcrEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "base", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "base", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java b/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java
index 766a881..acdc3ca 100644
--- a/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java
+++ b/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JdbcEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "dataSourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "dataSourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
index bff5b94..d41aaba 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JettyHttp9EndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java b/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java
index 3136314..9f228f3 100644
--- a/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java
+++ b/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JGroupsRaftEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java b/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java
index c0b58e7..0a16147 100644
--- a/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java
+++ b/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JGroupsEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java b/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java
index 461fc5f..d197386 100644
--- a/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java
+++ b/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JingEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java b/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java
index da171e6..baa58cf 100644
--- a/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java
+++ b/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JiraEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java
index e220238..7380b20 100644
--- a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java
+++ b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class JmsEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java b/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java
index dcb1259..77476fa 100644
--- a/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java
+++ b/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JMXEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "serverURL", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "serverURL", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java
index 95be00d..758ac7a 100644
--- a/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java
+++ b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JoltEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java
index 0040731..0abd2ad 100644
--- a/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java
+++ b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JooqEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "entityType", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java b/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java
index 3b9e367..4241d9a 100644
--- a/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java
+++ b/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JpaEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "entityType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java b/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java
index 605e90a..1df870f 100644
--- a/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java
+++ b/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class ScpEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java b/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java
index b8152bd..cd27b7e 100644
--- a/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java
+++ b/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JsltEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java b/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java
index 81b0960..cbcdcd8 100644
--- a/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java
+++ b/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JsonValidatorEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java b/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java
index 8f9dc52..47579e2 100644
--- a/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java
+++ b/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JsonataEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java b/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java
index e1e55fd..cc8d4b0 100644
--- a/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java
+++ b/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,18 +20,18 @@ public class Jt400EndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "userID", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "password", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "systemName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "objectPath", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "userID", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "password", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "systemName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "objectPath", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java
index 6a02d71..54165e2 100644
--- a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java
+++ b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KafkaEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java
index 50030a4..f3448a0 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesConfigMapsEndpointUriAssembler extends org.apache.camel.s
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java
index d68fbdd..7d0bcb6 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesDeploymentsEndpointUriAssembler extends org.apache.camel.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java
index 82ab880..25f5cbf 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesHPAEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java
index 9d2079d..3b9e082 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesJobEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java
index 2a821cd..cdde84e 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesNamespacesEndpointUriAssembler extends org.apache.camel.s
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java
index 95a6874..b38336f8 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesNodesEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java
index 96c93a2..c5b33a1 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesPersistentVolumesEndpointUriAssembler extends org.apache.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java
index 13fd55b..0d2556e 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesPersistentVolumesClaimsEndpointUriAssembler extends org.a
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java
index 5d3467b..9dbbefe 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesPodsEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java
index afabdbb..fcad2db 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesReplicationControllersEndpointUriAssembler extends org.ap
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java
index 9a34d36..3898156 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesResourcesQuotaEndpointUriAssembler extends org.apache.cam
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java
index 54973270..f72b5fac 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesSecretsEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java
index 895091a..d20ed27 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesServiceAccountsEndpointUriAssembler extends org.apache.ca
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java
index b59db05..dd15074 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesServicesEndpointUriAssembler extends org.apache.camel.sup
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java
index 130e6ea..3ecc832 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class OpenshiftBuildConfigsEndpointUriAssembler extends org.apache.camel.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java
index 2d7c3af..732044c 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class OpenshiftBuildsEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java b/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java
index 5e2259e..d9197fa 100644
--- a/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java
+++ b/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class KuduEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "tableName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java b/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java
index 354a5c5..b848443 100644
--- a/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java
+++ b/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class LanguageEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "languageName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "languageName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java b/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java
index b651d8b..d380ebb 100644
--- a/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java
+++ b/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class LdapEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "dirContextName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "dirContextName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java b/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java
index c7b86f5..c183bd1 100644
--- a/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java
+++ b/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class LdifEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "ldapConnectionName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "ldapConnectionName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java b/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
index e18bb4c..27e4a73 100644
--- a/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
+++ b/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class LogEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "loggerName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "loggerName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java b/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java
index ff8b5da..f2099b7 100644
--- a/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java
+++ b/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class LuceneEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java b/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java
index c1ae92f..1dc20ed 100644
--- a/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java
+++ b/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class LumberjackEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5044", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "5044", false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java
index 2bcf7d9..e9ba83f 100644
--- a/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java
+++ b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,15 +26,15 @@ public class MailEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java b/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java
index df4157b..0b044ea 100644
--- a/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java
+++ b/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class MasterEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "delegateUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "delegateUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java b/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java
index 18bcd3b..c2e767e 100644
--- a/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java
+++ b/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class MetricsEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsType", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "metricsType", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "metricsName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java b/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java
index 5c6c678..613e331 100644
--- a/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java
+++ b/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class MicrometerEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsType", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "tags", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "metricsType", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "metricsName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "tags", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java b/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java
index 7311c03..3b98a6d 100644
--- a/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java
+++ b/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class MicroProfileMetricsEndpointUriAssembler extends org.apache.camel.su
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "metricType", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "metricType", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "metricName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java
index 60fefaf..d64f557 100644
--- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java
+++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MiloClientEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "endpointUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "endpointUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java
index 40006a4..6d41f6d 100644
--- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java
+++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MiloServerEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "itemId", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "itemId", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java b/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java
index be480b4..1ee6896 100644
--- a/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java
+++ b/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class MinaEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java
index 1d35bd1..49547b9 100644
--- a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java
+++ b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MinioEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "bucketName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "bucketName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java b/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java
index 3deb761..69e852b 100644
--- a/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java
+++ b/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class MllpEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java b/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java
index 754afff..fff7c83 100644
--- a/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java
+++ b/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MockEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java b/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java
index ed4a9e4..7f20f0a 100644
--- a/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java
+++ b/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GridFsEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java b/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java
index 2533c5c..a637b50 100644
--- a/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java
+++ b/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MongoDbEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java b/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java
index 9527d9c..cae3ae5 100644
--- a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java
+++ b/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MsvEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java b/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java
index 6404eb5..1aa6f60 100644
--- a/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java
+++ b/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MustacheEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java b/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java
index 78fa78b..a545b02 100644
--- a/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java
+++ b/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MvelEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java
index 1056b41..cae7de0 100644
--- a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java
+++ b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class MyBatisBeanEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java
index ae166c7..f655fbf 100644
--- a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java
+++ b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MyBatisEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "statement", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "statement", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java b/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java
index 0b120a3..ee877e0 100644
--- a/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java
+++ b/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class NagiosEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java b/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java
index 6f1d913..b39228e 100644
--- a/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java
+++ b/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NatsEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
index 0d42779..594021c 100644
--- a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
+++ b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class NettyHttpEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java
index 2a8ce1c..219e94d 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java
@@ -38,7 +38,7 @@ public class NettyHttpEndpointUriAssemblerTest extends CamelTestSupport {
         map.put("host", "a-b-c.hostname.tld");
         map.put("port", "8080");
         map.put("path", "anything");
-        String uri = assembler.buildUri(context, "netty-http", map);
+        String uri = assembler.buildUri("netty-http", map);
         assertEquals("netty-http:http:a-b-c.hostname.tld:8080/anything", uri);
 
         map = new LinkedHashMap<>();
@@ -46,7 +46,7 @@ public class NettyHttpEndpointUriAssemblerTest extends CamelTestSupport {
         map.put("host", "a-b-c.server.net");
         map.put("port", "8888");
         map.put("path", "service/v3");
-        uri = assembler.buildUri(context, "netty-http", map);
+        uri = assembler.buildUri("netty-http", map);
         assertEquals("netty-http:http:a-b-c.server.net:8888/service/v3", uri);
 
         map = new HashMap<>();
@@ -57,20 +57,20 @@ public class NettyHttpEndpointUriAssemblerTest extends CamelTestSupport {
         map.put("path", "foo/bar");
         map.put("disconnect", "true");
 
-        uri = assembler.buildUri(context, "netty-http", map);
+        uri = assembler.buildUri("netty-http", map);
         assertEquals("netty-http:http:localhost:8080/foo/bar?disconnect=true", uri);
 
         // lets switch protocol
         map.put("protocol", "https");
 
-        uri = assembler.buildUri(context, "netty-http", map);
+        uri = assembler.buildUri("netty-http", map);
         assertEquals("netty-http:https:localhost:8080/foo/bar?disconnect=true", uri);
 
         // lets set a query parameter in the path
         map.put("path", "foo/bar?verbose=true");
         map.put("disconnect", "true");
 
-        uri = assembler.buildUri(context, "netty-http", map);
+        uri = assembler.buildUri("netty-http", map);
         assertEquals("netty-http:https:localhost:8080/foo/bar?verbose=true&disconnect=true", uri);
     }
 
diff --git a/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java b/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java
index 8352448..b5e360d 100644
--- a/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java
+++ b/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class NettyEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java b/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java
index cc2c22d..034eb98 100644
--- a/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java
+++ b/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NitriteEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java b/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java
index 98fba8d..fb98761 100644
--- a/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java
+++ b/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NsqEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java b/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java
index 4d076d9..4a6d846 100644
--- a/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java
+++ b/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class OAIPMHEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "baseUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "baseUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java
index 84c55b5..98c861d 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class Olingo2EndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java
index b34f7fb..c45c071 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class Olingo4EndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java
index 840fd40..2b8311f 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CinderEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java
index 7581a8d..d743d69 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GlanceEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java
index 202ac83..d65ccf9 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KeystoneEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java
index 91416d1..b0d6533 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NeutronEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java
index 86571d0..b9e8905 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NovaEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java
index ea4ed23..709f710 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SwiftEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java b/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java
index 6d41946..eb1b35c 100644
--- a/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java
+++ b/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class OptaPlannerEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "configFile", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "configFile", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java b/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java
index 8951e60..57b84ce 100644
--- a/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java
+++ b/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class PahoEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java b/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java
index 0f45200..a33987b 100644
--- a/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java
+++ b/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class PdfEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java b/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java
index 979de7b..7602239 100644
--- a/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java
+++ b/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,18 +20,18 @@ public class PgReplicationSlotEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "slot", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5432", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "outputPlugin", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "slot", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", "localhost", false, copy);
+        uri = buildPathParameter(syntax, uri, "port", "5432", false, copy);
+        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "outputPlugin", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java b/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java
index 96ed10c..df2b9e2 100644
--- a/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java
+++ b/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class PgEventEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5432", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", "localhost", false, copy);
+        uri = buildPathParameter(syntax, uri, "port", "5432", false, copy);
+        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "channel", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java b/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java
index 3fc8f15..3a15bc0 100644
--- a/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java
+++ b/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class PlatformHttpEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java b/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java
index 341c879..f91157b 100644
--- a/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java
+++ b/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class PrinterEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "printername", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "printername", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java
index 795d589..7808fc1 100644
--- a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java
+++ b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class PubNubEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "channel", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java b/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java
index bc7d0c2..de5962a 100644
--- a/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java
+++ b/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class PulsarEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "persistence", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "tenant", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "persistence", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "tenant", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java
index 0292c44..b4f8c10 100644
--- a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java
+++ b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class QuartzEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "groupName", "Camel", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "triggerName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "groupName", "Camel", false, copy);
+        uri = buildPathParameter(syntax, uri, "triggerName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java b/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java
index 279f4b9..88dd3f1 100644
--- a/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java
+++ b/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class QuickfixjEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "configurationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "configurationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java b/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java
index 9d4e48b..61b3656 100644
--- a/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java
+++ b/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class RabbitMQEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "exchangeName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "exchangeName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java b/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java
index 0f794e9..2079719 100644
--- a/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java
+++ b/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ReactiveStreamsEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "stream", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "stream", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java b/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java
index 3b9a8fb..c216664 100644
--- a/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java
+++ b/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class RefEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java b/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java
index f71e638..ce90a01 100644
--- a/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java
+++ b/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class RestOpenApiEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "specificationUri", "openapi.json", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "operationId", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "specificationUri", "openapi.json", false, copy);
+        uri = buildPathParameter(syntax, uri, "operationId", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java b/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java
index 30bdb94..460fc75 100644
--- a/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java
+++ b/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class RestSwaggerEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "specificationUri", "swagger.json", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "operationId", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "specificationUri", "swagger.json", false, copy);
+        uri = buildPathParameter(syntax, uri, "operationId", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java
index 2afd38e..98a817c 100644
--- a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java
+++ b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class RestApiEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "contextIdPattern", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "contextIdPattern", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java
index 8db0eed..6b99833 100644
--- a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java
+++ b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class RestEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "method", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "uriTemplate", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "method", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "uriTemplate", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java b/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java
index 4b5ec11..8450f9d 100644
--- a/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java
+++ b/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ResteasyEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java b/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java
index 0f4069b..e899e21 100644
--- a/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java
+++ b/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class RobotFrameworkEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java b/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java
index d920fde..0f532d9 100644
--- a/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java
+++ b/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class RssEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "feedUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "feedUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java b/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java
index 8f5148c..88f882f 100644
--- a/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java
+++ b/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SagaEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "action", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "action", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java
index 09f6c5f..dbbffb7 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class SalesforceEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operationName", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "topicName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operationName", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "topicName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java b/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java
index 5a5c30d..01f6feb 100644
--- a/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java
+++ b/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NetWeaverEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "url", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "url", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java b/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java
index 134dc3e..ffad6a1 100644
--- a/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java
+++ b/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class XQueryEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java b/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java
index 2b0d77c..f0a6c41 100644
--- a/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java
+++ b/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SchedulerEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java b/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java
index 701e003..2957912 100644
--- a/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java
+++ b/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SchematronEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java b/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java
index c70d641..9e6563b 100644
--- a/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java
+++ b/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SedaEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java b/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java
index dc6c21d..483bd36 100644
--- a/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java
+++ b/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ServiceEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "delegateUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "delegateUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java b/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java
index 0d1d666..ed65b16 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java
+++ b/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ServiceNowEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "instanceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "instanceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java b/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java
index 6440299..7a47b51 100644
--- a/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java
+++ b/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ServletEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "contextPath", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "contextPath", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java b/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java
index 1467fbe..b95d392 100644
--- a/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java
+++ b/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class SipEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "uri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java
index 752080e..7703c5e 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class SjmsEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java
index c7c075f..3f841bc 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SjmsBatchEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java
index c274e2c..b0de7eb 100644
--- a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java
+++ b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class Sjms2EndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java b/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java
index 4f26a07..3e6be58 100644
--- a/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java
+++ b/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SlackEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "channel", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java b/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java
index a5afe72..18291ac 100644
--- a/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java
+++ b/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,15 +26,15 @@ public class SmppEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "2775", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", "localhost", false, copy);
+        uri = buildPathParameter(syntax, uri, "port", "2775", false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java b/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java
index 148db1b..4911876 100644
--- a/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java
+++ b/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class SnmpEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java b/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java
index 60bf588..e364622 100644
--- a/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java
+++ b/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class SolrEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "url", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "url", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java b/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java
index b64ebae..471efe3 100644
--- a/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java
+++ b/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SoroushBotEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "action", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "action", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java b/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java
index 0fe9b6c..61e656f 100644
--- a/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java
+++ b/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SparkEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "endpointType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "endpointType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java b/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java
index 219cbe0..c11668c 100644
--- a/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java
+++ b/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class SplunkHECEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "splunkURL", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "token", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "splunkURL", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "token", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java b/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java
index ed45166..c09ad50 100644
--- a/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java
+++ b/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SplunkEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java b/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java
index b64d34d..626b847 100644
--- a/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java
+++ b/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SpringBatchEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "jobName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "jobName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java b/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java
index 1605b9f..1d27fed 100644
--- a/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java
+++ b/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SpringIntegrationEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "defaultChannel", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "defaultChannel", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java b/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java
index 6cbb4b0..eee6e25 100644
--- a/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java
+++ b/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SpringLdapEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "templateName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "templateName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java
index 1c0c293..33ef04a6 100644
--- a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java
+++ b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class RedisEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java
index 5087fb5..1a08d7b 100644
--- a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java
+++ b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class SpringWebserviceEndpointUriAssembler extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "lookupKey", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "webServiceEndpointUri", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "expression", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "lookupKey", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "webServiceEndpointUri", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "expression", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java b/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java
index 8bb6ed2..ec85428 100644
--- a/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java
+++ b/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EventEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java
index fe729b4..5fd6055 100644
--- a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java
+++ b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SqlEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "query", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "query", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java
index 2fb16f9..927cfef 100644
--- a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java
+++ b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SqlStoredEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "template", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "template", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java b/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java
index 7c39d83..78c7083 100644
--- a/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java
+++ b/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class SshEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "22", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "22", false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java b/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java
index d92525e..9def716 100644
--- a/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java
+++ b/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class StAXEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "contentHandlerClass", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "contentHandlerClass", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java b/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java
index 1ce784a..27fcd44 100644
--- a/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java
+++ b/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class StompEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destination", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "destination", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java
index 6a5a066..6d96541 100644
--- a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java
+++ b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class StreamEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "kind", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "kind", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java b/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java
index 92dcca0..314efc0 100644
--- a/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java
+++ b/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class StringTemplateEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java b/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java
index 70068fa..19284eb 100644
--- a/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java
+++ b/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class StubEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java b/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java
index b2cb291..2ad67f0 100644
--- a/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java
+++ b/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TelegramEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java b/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java
index 681ca33..71da945 100644
--- a/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java
+++ b/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class ThriftEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "service", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "service", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java b/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java
index 9ce83ab..7c13909 100644
--- a/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java
+++ b/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TikaEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java b/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java
index 4688aa9..ce363e5 100644
--- a/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java
+++ b/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TimerEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "timerName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "timerName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java
index 4ce75c3..d3a73c7 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class TwilioEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java
index e9fe334..b9f502c 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TwitterDirectMessageEndpointUriAssembler extends org.apache.camel.s
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "user", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "user", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java
index 1bcb67b..8033cbc 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TwitterSearchEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "keywords", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "keywords", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java
index 7311e3b..9e51d4a 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TwitterTimelineEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "timelineType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "timelineType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java b/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java
index dc44e61..aa54ba9 100644
--- a/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java
+++ b/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class UndertowEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
         String syntax = scheme + BASE;
         String uri = syntax;
 
         Map<String, Object> copy = new HashMap<>(parameters);
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpURI", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpURI", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java b/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java
index a6b9a79..7dead9b 100644
--- a/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java
+++ b/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java
... 766 lines suppressed ...


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

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

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

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

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

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


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

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

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

commit c0585571a31d70209f5408849bb7c015632a2c15
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Sep 24 16:00:08 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../org/apache/camel/ExtendedCamelContext.java     |  6 ++++
 .../apache/camel/catalog/RuntimeCamelCatalog.java  |  5 +++
 .../org/apache/camel/spi/EndpointUriAssembler.java | 41 +++++++++++++++++++++
 .../camel/impl/engine/AbstractCamelContext.java    | 13 +++++++
 .../runtime-camelcatalog-endpointuriassembler      |  2 ++
 .../impl/CamelCatalogEndpointUriAssembler.java     | 30 ++++++++++++++++
 .../camel/impl/lw/LightweightCamelContext.java     |  6 ++++
 .../impl/lw/LightweightRuntimeCamelContext.java    |  7 ++++
 ...untimeCamelCatalogEndpointUriAssemblerTest.java | 42 ++++++++++++++++++++++
 9 files changed, 152 insertions(+)

diff --git a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index e469142..4122a85 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -36,6 +36,7 @@ import org.apache.camel.spi.ConfigurerResolver;
 import org.apache.camel.spi.DataFormatResolver;
 import org.apache.camel.spi.DeferServiceFactory;
 import org.apache.camel.spi.EndpointStrategy;
+import org.apache.camel.spi.EndpointUriAssembler;
 import org.apache.camel.spi.FactoryFinder;
 import org.apache.camel.spi.FactoryFinderResolver;
 import org.apache.camel.spi.HeadersMapFactory;
@@ -556,6 +557,11 @@ public interface ExtendedCamelContext extends CamelContext {
     RouteController getInternalRouteController();
 
     /**
+     * Gets the {@link EndpointUriAssembler} for the given component name.
+     */
+    EndpointUriAssembler getEndpointUriAssembler(String scheme);
+
+    /**
      * Internal API for adding routes. Do not use this as end user.
      */
     void addRoute(Route route);
diff --git a/core/camel-api/src/main/java/org/apache/camel/catalog/RuntimeCamelCatalog.java b/core/camel-api/src/main/java/org/apache/camel/catalog/RuntimeCamelCatalog.java
index ca0e6aa..d7d5555 100644
--- a/core/camel-api/src/main/java/org/apache/camel/catalog/RuntimeCamelCatalog.java
+++ b/core/camel-api/src/main/java/org/apache/camel/catalog/RuntimeCamelCatalog.java
@@ -36,6 +36,11 @@ public interface RuntimeCamelCatalog extends StaticService, CamelContextAware {
     String FACTORY = "runtime-camelcatalog";
 
     /**
+     * Factory key for {@link org.apache.camel.spi.EndpointUriAssembler}
+     */
+    String ENDPOINT_URI_ASSEMBLER_FACTORY = "runtime-camelcatalog-endpointuriassembler";
+
+    /**
      * Returns the component information as JSON format.
      * <p/>
      * This API is needed by {@link ComponentVerifierExtension}.
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
new file mode 100644
index 0000000..27ba83f
--- /dev/null
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spi;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+
+/**
+ * To assemble an endpoint uri String from a map of parameters.
+ */
+public interface EndpointUriAssembler {
+
+    // TODO: Consider a better name.
+
+    /**
+     * Assembles an endpoint uri for the given component name with the given parameters.
+     *
+     * @param  camelContext the Camel context
+     * @param  scheme       the component name
+     * @param  parameters   endpoint options
+     * @return              the constructed endpoint uri
+     */
+    String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) throws URISyntaxException;
+
+}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 58fc598..cdab0f2 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -95,6 +95,7 @@ import org.apache.camel.spi.Debugger;
 import org.apache.camel.spi.DeferServiceFactory;
 import org.apache.camel.spi.EndpointRegistry;
 import org.apache.camel.spi.EndpointStrategy;
+import org.apache.camel.spi.EndpointUriAssembler;
 import org.apache.camel.spi.EventNotifier;
 import org.apache.camel.spi.ExecutorServiceManager;
 import org.apache.camel.spi.FactoryFinder;
@@ -4234,6 +4235,18 @@ public abstract class AbstractCamelContext extends BaseService
         return internalRouteController;
     }
 
+    @Override
+    public EndpointUriAssembler getEndpointUriAssembler(String scheme) {
+        // TODO: lookup factory specific for a given component
+
+        // no specific factory found so lets fallback to use runtime catalog
+        return new BaseServiceResolver<>(RuntimeCamelCatalog.ENDPOINT_URI_ASSEMBLER_FACTORY, EndpointUriAssembler.class)
+                .resolve(getCamelContextReference())
+                .orElseThrow(() -> new IllegalArgumentException(
+                        "Cannot find RuntimeCamelCatalog on classpath. "
+                                                                + "Add camel-core-catalog to classpath."));
+    }
+
     public enum Initialization {
         Eager,
         Default,
diff --git a/core/camel-core-catalog/src/generated/resources/META-INF/services/org/apache/camel/runtime-camelcatalog-endpointuriassembler b/core/camel-core-catalog/src/generated/resources/META-INF/services/org/apache/camel/runtime-camelcatalog-endpointuriassembler
new file mode 100644
index 0000000..ec29104
--- /dev/null
+++ b/core/camel-core-catalog/src/generated/resources/META-INF/services/org/apache/camel/runtime-camelcatalog-endpointuriassembler
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.catalog.impl.CamelCatalogEndpointUriAssembler
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java
new file mode 100644
index 0000000..153671e
--- /dev/null
+++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java
@@ -0,0 +1,30 @@
+package org.apache.camel.catalog.impl;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.catalog.RuntimeCamelCatalog;
+import org.apache.camel.spi.EndpointUriAssembler;
+import org.apache.camel.spi.annotations.JdkService;
+
+import static org.apache.camel.catalog.RuntimeCamelCatalog.ENDPOINT_URI_ASSEMBLER_FACTORY;
+
+/**
+ * Uses {@link RuntimeCamelCatalog} to assemble the endpoint uri.
+ */
+@JdkService(ENDPOINT_URI_ASSEMBLER_FACTORY)
+public class CamelCatalogEndpointUriAssembler implements EndpointUriAssembler {
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) {
+        try {
+            return camelContext.adapt(ExtendedCamelContext.class).getRuntimeCamelCatalog().asEndpointUri(scheme, parameters,
+                    false);
+        } catch (URISyntaxException e) {
+            throw RuntimeCamelException.wrapRuntimeException(e);
+        }
+    }
+}
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
index 90ea6a0..235fdfa 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
@@ -89,6 +89,7 @@ import org.apache.camel.spi.Debugger;
 import org.apache.camel.spi.DeferServiceFactory;
 import org.apache.camel.spi.EndpointRegistry;
 import org.apache.camel.spi.EndpointStrategy;
+import org.apache.camel.spi.EndpointUriAssembler;
 import org.apache.camel.spi.ExecutorServiceManager;
 import org.apache.camel.spi.FactoryFinder;
 import org.apache.camel.spi.FactoryFinderResolver;
@@ -1416,6 +1417,11 @@ public class LightweightCamelContext implements ExtendedCamelContext, CatalogCam
     }
 
     @Override
+    public EndpointUriAssembler getEndpointUriAssembler(String scheme) {
+        return getExtendedCamelContext().getEndpointUriAssembler(scheme);
+    }
+
+    @Override
     public void addRoute(Route route) {
         getExtendedCamelContext().addRoute(route);
     }
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
index 1e76e83..4c993ae 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
@@ -84,6 +84,7 @@ import org.apache.camel.spi.Debugger;
 import org.apache.camel.spi.DeferServiceFactory;
 import org.apache.camel.spi.EndpointRegistry;
 import org.apache.camel.spi.EndpointStrategy;
+import org.apache.camel.spi.EndpointUriAssembler;
 import org.apache.camel.spi.ExecutorServiceManager;
 import org.apache.camel.spi.FactoryFinder;
 import org.apache.camel.spi.FactoryFinderResolver;
@@ -1856,6 +1857,12 @@ public class LightweightRuntimeCamelContext implements ExtendedCamelContext, Cat
         };
     }
 
+    @Override
+    public EndpointUriAssembler getEndpointUriAssembler(String scheme) {
+        // TODO: If this experiment is continued then this should be implemented
+        throw new UnsupportedOperationException();
+    }
+
     private void startService(Service service) throws Exception {
         // and register startup aware so they can be notified when
         // camel context has been started
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
new file mode 100644
index 0000000..3bdf989
--- /dev/null
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.catalog;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class RuntimeCamelCatalogEndpointUriAssemblerTest extends ContextTestSupport {
+
+    @Test
+    public void testAssemble() throws Exception {
+        EndpointUriAssembler assembler = context.adapt(ExtendedCamelContext.class).getEndpointUriAssembler("timer");
+
+        Map<String, String> params = new HashMap<>();
+        params.put("timerName", "foo");
+        params.put("period", "123");
+        params.put("repeatCount", "5");
+
+        String uri = assembler.buildUri(context, "timer", params);
+        Assertions.assertEquals("timer:foo?period=123&repeatCount=5", uri);
+    }
+}


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

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

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

commit 6e668189bffcf459d74034ddf88895bb096c08ae
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 14:22:26 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../org/apache/camel/spi/EndpointUriAssembler.java | 13 ++---
 .../impl/engine/DefaultAssemblerResolver.java      |  2 +
 .../catalog/CustomEndpointUriAssemblerTest.java    | 67 +++++++++++++---------
 ...untimeCamelCatalogEndpointUriAssemblerTest.java |  2 +-
 .../component/log/LogEndpointUriAssemblerTest.java |  2 +-
 .../component/EndpointUriAssemblerSupport.java     | 17 +++++-
 .../packaging/EndpointUriAssemblerGenerator.java   |  7 +--
 7 files changed, 66 insertions(+), 44 deletions(-)

diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
index 427d526..8480eeb 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
@@ -19,12 +19,12 @@ package org.apache.camel.spi;
 import java.net.URISyntaxException;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
 
 /**
  * To assemble an endpoint uri String from a map of parameters.
  */
-public interface EndpointUriAssembler {
+public interface EndpointUriAssembler extends CamelContextAware {
 
     /**
      * Checks whether this assembler supports the given component name
@@ -34,11 +34,10 @@ public interface EndpointUriAssembler {
     /**
      * Assembles an endpoint uri for the given component name with the given parameters.
      *
-     * @param  camelContext the Camel context
-     * @param  scheme       the component name
-     * @param  parameters   endpoint options
-     * @return              the constructed endpoint uri
+     * @param  scheme     the component name
+     * @param  parameters endpoint options
+     * @return            the constructed endpoint uri
      */
-    String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException;
+    String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException;
 
 }
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAssemblerResolver.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAssemblerResolver.java
index c8ffea6..9737fef 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAssemblerResolver.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAssemblerResolver.java
@@ -71,6 +71,7 @@ public class DefaultAssemblerResolver extends ServiceSupport implements CamelCon
         Set<EndpointUriAssembler> assemblers = context.getRegistry().findByType(EndpointUriAssembler.class);
         answer = assemblers.stream().filter(a -> a.isEnabled(name)).findFirst().orElse(null);
         if (answer != null) {
+            answer.setCamelContext(context);
             cache.put(name, answer);
             return answer;
         }
@@ -96,6 +97,7 @@ public class DefaultAssemblerResolver extends ServiceSupport implements CamelCon
             // create the assembler
             if (EndpointUriAssembler.class.isAssignableFrom(type)) {
                 answer = (EndpointUriAssembler) context.getInjector().newInstance(type, false);
+                answer.setCamelContext(context);
                 cache.put(name, answer);
                 return answer;
             } else {
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
index d0bb0ff..ffd65af 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
@@ -34,6 +33,7 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
     @Test
     public void testCustomAssemble() throws Exception {
         EndpointUriAssembler assembler = new MyAssembler();
+        assembler.setCamelContext(context);
 
         Map<String, Object> params = new HashMap<>();
         params.put("name", "foo");
@@ -41,13 +41,14 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         params.put("port", 4444);
         params.put("verbose", true);
 
-        String uri = assembler.buildUri(context, "acme", params);
+        String uri = assembler.buildUri("acme", params);
         Assertions.assertEquals("acme:foo:4444?amount=123&verbose=true", uri);
     }
 
     @Test
     public void testCustomAssembleRegistry() throws Exception {
-        context.getRegistry().bind("myAssembler", new MyAssembler());
+        EndpointUriAssembler assembler = new MyAssembler();
+        context.getRegistry().bind("myAssembler", assembler);
 
         Map<String, Object> params = new HashMap<>();
         params.put("name", "foo");
@@ -55,14 +56,15 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         params.put("port", 4444);
         params.put("verbose", true);
 
-        EndpointUriAssembler assembler = context.adapt(ExtendedCamelContext.class).getEndpointUriAssembler("acme");
-        String uri = assembler.buildUri(context, "acme", params);
+        assembler = context.adapt(ExtendedCamelContext.class).getEndpointUriAssembler("acme");
+        String uri = assembler.buildUri("acme", params);
         Assertions.assertEquals("acme:foo:4444?amount=123&verbose=true", uri);
     }
 
     @Test
     public void testCustomAssembleUnsorted() throws Exception {
         EndpointUriAssembler assembler = new MyAssembler();
+        assembler.setCamelContext(context);
 
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("name", "foo");
@@ -70,13 +72,14 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         params.put("port", 4444);
         params.put("amount", "123");
 
-        String uri = assembler.buildUri(context, "acme", params);
+        String uri = assembler.buildUri("acme", params);
         Assertions.assertEquals("acme:foo:4444?amount=123&verbose=false", uri);
     }
 
     @Test
     public void testCustomAssembleNoMandatory() throws Exception {
         EndpointUriAssembler assembler = new MyAssembler();
+        assembler.setCamelContext(context);
 
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("verbose", false);
@@ -84,7 +87,7 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         params.put("amount", "123");
 
         try {
-            assembler.buildUri(context, "acme", params);
+            assembler.buildUri("acme", params);
             Assertions.fail();
         } catch (IllegalArgumentException e) {
             Assertions.assertEquals("Option name is required when creating endpoint uri with syntax acme:name:port",
@@ -95,19 +98,21 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
     @Test
     public void testCustomAssembleDefault() throws Exception {
         EndpointUriAssembler assembler = new MyAssembler();
+        assembler.setCamelContext(context);
 
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("name", "bar");
         params.put("verbose", false);
         params.put("amount", "123");
 
-        String uri = assembler.buildUri(context, "acme", params);
+        String uri = assembler.buildUri("acme", params);
         Assertions.assertEquals("acme:bar?amount=123&verbose=false", uri);
     }
 
     @Test
     public void testCustomAssembleComplex() throws Exception {
         EndpointUriAssembler assembler = new MySecondAssembler();
+        assembler.setCamelContext(context);
 
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("name", "bar");
@@ -115,13 +120,14 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         params.put("verbose", true);
         params.put("amount", "123");
 
-        String uri = assembler.buildUri(context, "acme2", params);
+        String uri = assembler.buildUri("acme2", params);
         Assertions.assertEquals("acme2:bar/moes?amount=123&verbose=true", uri);
     }
 
     @Test
     public void testCustomAssembleComplexPort() throws Exception {
         EndpointUriAssembler assembler = new MySecondAssembler();
+        assembler.setCamelContext(context);
 
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("name", "bar");
@@ -130,13 +136,14 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         params.put("verbose", true);
         params.put("amount", "123");
 
-        String uri = assembler.buildUri(context, "acme2", params);
+        String uri = assembler.buildUri("acme2", params);
         Assertions.assertEquals("acme2:bar/moes:4444?amount=123&verbose=true", uri);
     }
 
     @Test
     public void testCustomAssembleComplexNoPath() throws Exception {
         EndpointUriAssembler assembler = new MySecondAssembler();
+        assembler.setCamelContext(context);
 
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("name", "bar");
@@ -144,58 +151,62 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         params.put("verbose", true);
         params.put("amount", "123");
 
-        String uri = assembler.buildUri(context, "acme2", params);
+        String uri = assembler.buildUri("acme2", params);
         Assertions.assertEquals("acme2:bar:4444?amount=123&verbose=true", uri);
     }
 
     @Test
     public void testCustomAssembleComplexNoPathNoPort() throws Exception {
         EndpointUriAssembler assembler = new MySecondAssembler();
+        assembler.setCamelContext(context);
 
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("name", "bar");
         params.put("verbose", true);
         params.put("amount", "123");
 
-        String uri = assembler.buildUri(context, "acme2", params);
+        String uri = assembler.buildUri("acme2", params);
         Assertions.assertEquals("acme2:bar?amount=123&verbose=true", uri);
     }
 
     @Test
     public void testJms() throws Exception {
         EndpointUriAssembler assembler = new MyJmsAssembler();
+        assembler.setCamelContext(context);
 
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("destinationName", "foo");
         params.put("destinationType", "topic");
         params.put("deliveryPersistent", true);
 
-        String uri = assembler.buildUri(context, "jms2", params);
+        String uri = assembler.buildUri("jms2", params);
         Assertions.assertEquals("jms2:topic:foo?deliveryPersistent=true", uri);
     }
 
     @Test
     public void testJmsMatchDefault() throws Exception {
         EndpointUriAssembler assembler = new MyJmsAssembler();
+        assembler.setCamelContext(context);
 
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("destinationName", "foo");
         params.put("destinationType", "queue");
         params.put("deliveryPersistent", true);
 
-        String uri = assembler.buildUri(context, "jms2", params);
+        String uri = assembler.buildUri("jms2", params);
         Assertions.assertEquals("jms2:queue:foo?deliveryPersistent=true", uri);
     }
 
     @Test
     public void testJmsNoDefault() throws Exception {
         EndpointUriAssembler assembler = new MyJmsAssembler();
+        assembler.setCamelContext(context);
 
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("destinationName", "foo");
         params.put("deliveryPersistent", true);
 
-        String uri = assembler.buildUri(context, "jms2", params);
+        String uri = assembler.buildUri("jms2", params);
         Assertions.assertEquals("jms2:foo?deliveryPersistent=true", uri);
     }
 
@@ -209,16 +220,16 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         }
 
         @Override
-        public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters)
+        public String buildUri(String scheme, Map<String, Object> parameters)
                 throws URISyntaxException {
             // begin from syntax
             String uri = SYNTAX;
 
             // append path parameters
-            uri = buildPathParameter(camelContext, SYNTAX, uri, "name", null, true, parameters);
-            uri = buildPathParameter(camelContext, SYNTAX, uri, "port", 8080, false, parameters);
+            uri = buildPathParameter(SYNTAX, uri, "name", null, true, parameters);
+            uri = buildPathParameter(SYNTAX, uri, "port", 8080, false, parameters);
             // append remainder parameters
-            uri = buildQueryParameters(camelContext, uri, parameters);
+            uri = buildQueryParameters(uri, parameters);
 
             return uri;
         }
@@ -235,17 +246,17 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         }
 
         @Override
-        public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters)
+        public String buildUri(String scheme, Map<String, Object> parameters)
                 throws URISyntaxException {
             // begin from syntax
             String uri = SYNTAX;
 
             // append path parameters
-            uri = buildPathParameter(camelContext, SYNTAX, uri, "name", null, true, parameters);
-            uri = buildPathParameter(camelContext, SYNTAX, uri, "path", null, false, parameters);
-            uri = buildPathParameter(camelContext, SYNTAX, uri, "port", 8080, false, parameters);
+            uri = buildPathParameter(SYNTAX, uri, "name", null, true, parameters);
+            uri = buildPathParameter(SYNTAX, uri, "path", null, false, parameters);
+            uri = buildPathParameter(SYNTAX, uri, "port", 8080, false, parameters);
             // append remainder parameters
-            uri = buildQueryParameters(camelContext, uri, parameters);
+            uri = buildQueryParameters(uri, parameters);
 
             return uri;
         }
@@ -262,13 +273,13 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         }
 
         @Override
-        public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters)
+        public String buildUri(String scheme, Map<String, Object> parameters)
                 throws URISyntaxException {
 
             String uri = SYNTAX;
-            uri = buildPathParameter(camelContext, SYNTAX, uri, "destinationType", "queue", false, parameters);
-            uri = buildPathParameter(camelContext, SYNTAX, uri, "destinationName", null, true, parameters);
-            uri = buildQueryParameters(camelContext, uri, parameters);
+            uri = buildPathParameter(SYNTAX, uri, "destinationType", "queue", false, parameters);
+            uri = buildPathParameter(SYNTAX, uri, "destinationName", null, true, parameters);
+            uri = buildQueryParameters(uri, parameters);
 
             return uri;
         }
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
index f52d4a7..683b626 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
@@ -36,7 +36,7 @@ public class RuntimeCamelCatalogEndpointUriAssemblerTest extends ContextTestSupp
         params.put("period", "123");
         params.put("repeatCount", "5");
 
-        String uri = assembler.buildUri(context, "timer", params);
+        String uri = assembler.buildUri("timer", params);
         Assertions.assertEquals("timer:foo?period=123&repeatCount=5", uri);
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointUriAssemblerTest.java
index f8115fd..528f0bb 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointUriAssemblerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointUriAssemblerTest.java
@@ -25,7 +25,7 @@ public class LogEndpointUriAssemblerTest extends ContextTestSupport {
         boolean generated = assembler instanceof LogEndpointUriAssembler;
         Assertions.assertTrue(generated);
 
-        String uri = assembler.buildUri(context, "log", params);
+        String uri = assembler.buildUri("log", params);
         Assertions.assertEquals("log:foo?groupSize=123&logMask=true&showExchangePattern=false", uri);
     }
 }
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
index cfcb0d5..1a3ec4d 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
 
@@ -28,10 +29,20 @@ import org.apache.camel.util.URISupport;
  * Base class used by Camel Package Maven Plugin when it generates source code for fast endpoint uri assembler via
  * {@link org.apache.camel.spi.EndpointUriAssembler}.
  */
-public abstract class EndpointUriAssemblerSupport {
+public abstract class EndpointUriAssemblerSupport implements CamelContextAware {
+
+    protected CamelContext camelContext;
+
+    public CamelContext getCamelContext() {
+        return camelContext;
+    }
+
+    public void setCamelContext(CamelContext camelContext) {
+        this.camelContext = camelContext;
+    }
 
     protected String buildPathParameter(
-            CamelContext camelContext, String syntax, String uri, String name, Object defaultValue, boolean required,
+            String syntax, String uri, String name, Object defaultValue, boolean required,
             Map<String, Object> parameters) {
         Object obj = parameters.remove(name);
         if (ObjectHelper.isEmpty(obj) && defaultValue != null && required) {
@@ -62,7 +73,7 @@ public abstract class EndpointUriAssemblerSupport {
         return uri;
     }
 
-    protected String buildQueryParameters(CamelContext camelContext, String uri, Map<String, Object> parameters)
+    protected String buildQueryParameters(String uri, Map<String, Object> parameters)
             throws URISyntaxException {
         // we want sorted parameters
         Map<String, Object> map = new TreeMap<>(parameters);
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
index 90e8f0b..8aa7bc9 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
@@ -40,7 +40,6 @@ public final class EndpointUriAssemblerGenerator {
         w.write("import java.util.HashMap;\n");
         w.write("import java.util.Map;\n");
         w.write("\n");
-        w.write("import org.apache.camel.CamelContext;\n");
         w.write("import org.apache.camel.spi.EndpointUriAssembler;\n");
         w.write("\n");
         w.write("/**\n");
@@ -70,17 +69,17 @@ public final class EndpointUriAssemblerGenerator {
         w.write("    }\n");
         w.write("\n");
         w.write("    @Override\n");
-        w.write("    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {\n");
+        w.write("    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {\n");
         w.write("        String syntax = scheme + BASE;\n");
         w.write("        String uri = syntax;\n");
         w.write("\n");
         w.write("        Map<String, Object> copy = new HashMap<>(parameters);\n");
         w.write("\n");
         for (BaseOptionModel option : model.getEndpointPathOptions()) {
-            w.write("        uri = buildPathParameter(camelContext, syntax, uri, \"" + option.getName() + "\", "
+            w.write("        uri = buildPathParameter(syntax, uri, \"" + option.getName() + "\", "
                     + defaultValue(option) + ", " + option.isRequired() + ", copy);\n");
         }
-        w.write("        uri = buildQueryParameters(camelContext, uri, copy);\n");
+        w.write("        uri = buildQueryParameters(uri, copy);\n");
         w.write("        return uri;\n");
         w.write("    }\n");
         w.write("}\n");


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

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

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

commit f3d4a45e0647f98bf4b59f44340ffa3d1f04f8d5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 12:52:28 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../activemq/ActiveMQEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/activemq-endpoint   |  2 ++
 .../component/ahc/ws/WsEndpointUriAssembler.java   | 38 ++++++++++++++++++++
 .../org/apache/camel/assembler/ahc-ws-endpoint     |  2 ++
 .../org/apache/camel/assembler/ahc-wss-endpoint    |  2 ++
 .../component/amqp/AMQPEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/amqp-endpoint       |  2 ++
 .../component/apns/ApnsEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/apns-endpoint       |  2 ++
 .../arangodb/ArangoDbEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/arangodb-endpoint   |  2 ++
 .../component/as2/AS2EndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/as2-endpoint        |  2 ++
 .../asterisk/AsteriskEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/asterisk-endpoint   |  2 ++
 .../component/atmos/AtmosEndpointUriAssembler.java | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/atmos-endpoint      |  2 ++
 .../websocket/WebsocketEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../camel/assembler/atmosphere-websocket-endpoint  |  2 ++
 .../component/atom/AtomEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/atom-endpoint       |  2 ++
 .../client/map/AtomixMapEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../AtomixMessagingEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../AtomixMultiMapEndpointUriAssembler.java        | 32 +++++++++++++++++
 .../queue/AtomixQueueEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../client/set/AtomixSetEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../value/AtomixValueEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/atomix-map-endpoint |  2 ++
 .../camel/assembler/atomix-messaging-endpoint      |  2 ++
 .../camel/assembler/atomix-multimap-endpoint       |  2 ++
 .../apache/camel/assembler/atomix-queue-endpoint   |  2 ++
 .../org/apache/camel/assembler/atomix-set-endpoint |  2 ++
 .../apache/camel/assembler/atomix-value-endpoint   |  2 ++
 .../component/avro/AvroEndpointUriAssembler.java   | 35 +++++++++++++++++++
 .../org/apache/camel/assembler/avro-endpoint       |  2 ++
 .../component/aws/cw/CwEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-cw-endpoint     |  2 ++
 .../component/aws/ddb/DdbEndpointUriAssembler.java | 32 +++++++++++++++++
 .../ddbstream/DdbStreamEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-ddb-endpoint    |  2 ++
 .../apache/camel/assembler/aws-ddbstream-endpoint  |  2 ++
 .../component/aws/ec2/EC2EndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-ec2-endpoint    |  2 ++
 .../component/aws/ecs/ECSEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-ecs-endpoint    |  2 ++
 .../component/aws/eks/EKSEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-eks-endpoint    |  2 ++
 .../component/aws/iam/IAMEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-iam-endpoint    |  2 ++
 .../KinesisFirehoseEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../aws/kinesis/KinesisEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../apache/camel/assembler/aws-kinesis-endpoint    |  2 ++
 .../camel/assembler/aws-kinesis-firehose-endpoint  |  2 ++
 .../component/aws/kms/KMSEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-kms-endpoint    |  2 ++
 .../aws/lambda/LambdaEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-lambda-endpoint |  2 ++
 .../component/aws/mq/MQEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-mq-endpoint     |  2 ++
 .../component/aws/msk/MSKEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-msk-endpoint    |  2 ++
 .../component/aws/s3/S3EndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-s3-endpoint     |  2 ++
 .../component/aws/sdb/SdbEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-sdb-endpoint    |  2 ++
 .../component/aws/ses/SesEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-ses-endpoint    |  2 ++
 .../component/aws/sns/SnsEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-sns-endpoint    |  2 ++
 .../component/aws/sqs/SqsEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-sqs-endpoint    |  2 ++
 .../component/aws/swf/SWFEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws-swf-endpoint    |  2 ++
 .../translate/TranslateEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../apache/camel/assembler/aws-translate-endpoint  |  2 ++
 .../aws2/athena/Athena2EndpointUriAssembler.java   | 32 +++++++++++++++++
 .../apache/camel/assembler/aws2-athena-endpoint    |  2 ++
 .../component/aws2/cw/Cw2EndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-cw-endpoint    |  2 ++
 .../aws2/ddb/Ddb2EndpointUriAssembler.java         | 32 +++++++++++++++++
 .../ddbstream/Ddb2StreamEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-ddb-endpoint   |  2 ++
 .../apache/camel/assembler/aws2-ddbstream-endpoint |  2 ++
 .../aws2/ec2/AWS2EC2EndpointUriAssembler.java      | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-ec2-endpoint   |  2 ++
 .../aws2/ecs/ECS2EndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-ecs-endpoint   |  2 ++
 .../aws2/eks/EKS2EndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-eks-endpoint   |  2 ++
 .../EventbridgeEndpointUriAssembler.java           | 18 +++++++---
 .../aws2/iam/IAM2EndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-iam-endpoint   |  2 ++
 .../KinesisFirehose2EndpointUriAssembler.java      | 32 +++++++++++++++++
 .../aws2/kinesis/Kinesis2EndpointUriAssembler.java | 32 +++++++++++++++++
 .../apache/camel/assembler/aws2-kinesis-endpoint   |  2 ++
 .../camel/assembler/aws2-kinesis-firehose-endpoint |  2 ++
 .../aws2/kms/KMS2EndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-kms-endpoint   |  2 ++
 .../aws2/lambda/Lambda2EndpointUriAssembler.java   | 32 +++++++++++++++++
 .../apache/camel/assembler/aws2-lambda-endpoint    |  2 ++
 .../component/aws2/mq/MQ2EndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-mq-endpoint    |  2 ++
 .../aws2/msk/MSK2EndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-msk-endpoint   |  2 ++
 .../aws2/s3/AWS2S3EndpointUriAssembler.java        | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-s3-endpoint    |  2 ++
 .../aws2/ses/Ses2EndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-ses-endpoint   |  2 ++
 .../aws2/sns/Sns2EndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-sns-endpoint   |  2 ++
 .../aws2/sqs/Sqs2EndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-sqs-endpoint   |  2 ++
 .../aws2/sts/STS2EndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/aws2-sts-endpoint   |  2 ++
 .../translate/Translate2EndpointUriAssembler.java  | 32 +++++++++++++++++
 .../apache/camel/assembler/aws2-translate-endpoint |  2 ++
 .../eventhubs/EventHubsEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../camel/assembler/azure-eventhubs-endpoint       |  2 ++
 .../storage/blob/BlobEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../camel/assembler/azure-storage-blob-endpoint    |  2 ++
 .../storage/queue/QueueEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../camel/assembler/azure-storage-queue-endpoint   |  2 ++
 .../blob/BlobServiceEndpointUriAssembler.java      | 32 +++++++++++++++++
 .../queue/QueueServiceEndpointUriAssembler.java    | 32 +++++++++++++++++
 .../org/apache/camel/assembler/azure-blob-endpoint |  2 ++
 .../apache/camel/assembler/azure-queue-endpoint    |  2 ++
 .../BeanValidatorEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../apache/camel/assembler/bean-validator-endpoint |  2 ++
 .../component/bean/BeanEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../beanclass/ClassEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/bean-endpoint       |  2 ++
 .../org/apache/camel/assembler/class-endpoint      |  2 ++
 .../beanstalk/BeanstalkEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/beanstalk-endpoint  |  2 ++
 .../bonita/BonitaEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/bonita-endpoint     |  2 ++
 .../component/box/BoxEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/box-endpoint        |  2 ++
 .../braintree/BraintreeEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/braintree-endpoint  |  2 ++
 .../browse/BrowseEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/browse-endpoint     |  2 ++
 .../cache/CaffeineCacheEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../CaffeineLoadCacheEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../apache/camel/assembler/caffeine-cache-endpoint |  2 ++
 .../camel/assembler/caffeine-loadcache-endpoint    |  2 ++
 .../cassandra/CassandraEndpointUriAssembler.java   | 35 +++++++++++++++++++
 .../org/apache/camel/assembler/cql-endpoint        |  2 ++
 .../chatscript/ChatScriptEndpointUriAssembler.java | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/chatscript-endpoint |  2 ++
 .../component/chunk/ChunkEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/chunk-endpoint      |  2 ++
 .../camel/component/cm/CMEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/cm-sms-endpoint     |  2 ++
 .../component/cmis/CMISEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/cmis-endpoint       |  2 ++
 .../camel/coap/CoAPEndpointUriAssembler.java       | 38 ++++++++++++++++++++
 .../org/apache/camel/assembler/coap+tcp-endpoint   |  2 ++
 .../org/apache/camel/assembler/coap-endpoint       |  2 ++
 .../org/apache/camel/assembler/coaps+tcp-endpoint  |  2 ++
 .../org/apache/camel/assembler/coaps-endpoint      |  2 ++
 .../cometd/CometdEndpointUriAssembler.java         | 40 ++++++++++++++++++++++
 .../org/apache/camel/assembler/cometd-endpoint     |  2 ++
 .../org/apache/camel/assembler/cometds-endpoint    |  2 ++
 .../consul/ConsulEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/consul-endpoint     |  2 ++
 .../controlbus/ControlBusEndpointUriAssembler.java | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/controlbus-endpoint |  2 ++
 .../component/corda/CordaEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/corda-endpoint      |  2 ++
 .../couchbase/CouchbaseEndpointUriAssembler.java   | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/couchbase-endpoint  |  2 ++
 .../couchdb/CouchDbEndpointUriAssembler.java       | 35 +++++++++++++++++++
 .../org/apache/camel/assembler/couchdb-endpoint    |  2 ++
 .../component/cron/CronEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/cron-endpoint       |  2 ++
 .../crypto/cms/CryptoCmsEndpointUriAssembler.java  | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/crypto-cms-endpoint |  2 ++
 .../DigitalSignatureEndpointUriAssembler.java      | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/crypto-endpoint     |  2 ++
 .../component/cxf/CxfEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../cxf/jaxrs/CxfRsEndpointUriAssembler.java       | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/cxf-endpoint        |  2 ++
 .../org/apache/camel/assembler/cxfrs-endpoint      |  2 ++
 .../dataformat/DataFormatEndpointUriAssembler.java | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/dataformat-endpoint |  2 ++
 .../dataset/DataSetEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../dataset/DataSetTestEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/dataset-endpoint    |  2 ++
 .../apache/camel/assembler/dataset-test-endpoint   |  2 ++
 .../DebeziumMongodbEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../camel/assembler/debezium-mongodb-endpoint      |  2 ++
 .../DebeziumMySqlEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../apache/camel/assembler/debezium-mysql-endpoint |  2 ++
 .../DebeziumPostgresEndpointUriAssembler.java      | 32 +++++++++++++++++
 .../camel/assembler/debezium-postgres-endpoint     |  2 ++
 .../DebeziumSqlserverEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../camel/assembler/debezium-sqlserver-endpoint    |  2 ++
 .../DigitalOceanEndpointUriAssembler.java          | 32 +++++++++++++++++
 .../apache/camel/assembler/digitalocean-endpoint   |  2 ++
 .../direct/DirectEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/direct-endpoint     |  2 ++
 .../directvm/DirectVmEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/direct-vm-endpoint  |  2 ++
 .../disruptor/DisruptorEndpointUriAssembler.java   | 38 ++++++++++++++++++++
 .../vm/DisruptorVmEndpointUriAssembler.java        | 38 ++++++++++++++++++++
 .../org/apache/camel/assembler/disruptor-endpoint  |  2 ++
 .../apache/camel/assembler/disruptor-vm-endpoint   |  2 ++
 .../component/djl/DJLEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/djl-endpoint        |  2 ++
 .../component/dns/DnsEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/dns-endpoint        |  2 ++
 .../docker/DockerEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/docker-endpoint     |  2 ++
 .../component/dozer/DozerEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/dozer-endpoint      |  2 ++
 .../component/drill/DrillEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/drill-endpoint      |  2 ++
 .../dropbox/DropboxEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/dropbox-endpoint    |  2 ++
 .../ehcache/EhcacheEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/ehcache-endpoint    |  2 ++
 .../ElasticsearchEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../camel/assembler/elasticsearch-rest-endpoint    |  2 ++
 .../component/elsql/ElsqlEndpointUriAssembler.java | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/elsql-endpoint      |  2 ++
 .../etcd/EtcdKeysEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../etcd/EtcdStatsEndpointUriAssembler.java        | 32 +++++++++++++++++
 .../etcd/EtcdWatchEndpointUriAssembler.java        | 32 +++++++++++++++++
 .../org/apache/camel/assembler/etcd-keys-endpoint  |  2 ++
 .../org/apache/camel/assembler/etcd-stats-endpoint |  2 ++
 .../org/apache/camel/assembler/etcd-watch-endpoint |  2 ++
 .../component/exec/ExecEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/exec-endpoint       |  2 ++
 .../facebook/FacebookEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/facebook-endpoint   |  2 ++
 .../component/fhir/FhirEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/fhir-endpoint       |  2 ++
 .../file/watch/FileWatchEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../org/apache/camel/assembler/file-watch-endpoint |  2 ++
 .../component/file/FileEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/file-endpoint       |  2 ++
 .../flatpack/FlatpackEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/flatpack-endpoint   |  2 ++
 .../component/flink/FlinkEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/flink-endpoint      |  2 ++
 .../component/fop/FopEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/fop-endpoint        |  2 ++
 .../freemarker/FreemarkerEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/freemarker-endpoint |  2 ++
 .../file/remote/FtpEndpointUriAssembler.java       | 34 ++++++++++++++++++
 .../file/remote/FtpsEndpointUriAssembler.java      | 34 ++++++++++++++++++
 .../file/remote/SftpEndpointUriAssembler.java      | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/ftp-endpoint        |  2 ++
 .../org/apache/camel/assembler/ftps-endpoint       |  2 ++
 .../org/apache/camel/assembler/sftp-endpoint       |  2 ++
 .../ganglia/GangliaEndpointUriAssembler.java       | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/ganglia-endpoint    |  2 ++
 .../geocoder/GeoCoderEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/geocoder-endpoint   |  2 ++
 .../component/git/GitEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/git-endpoint        |  2 ++
 .../github/GitHubEndpointUriAssembler.java         | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/github-endpoint     |  2 ++
 .../GoogleBigQueryEndpointUriAssembler.java        | 34 ++++++++++++++++++
 .../sql/GoogleBigQuerySQLEndpointUriAssembler.java | 33 ++++++++++++++++++
 .../camel/assembler/google-bigquery-endpoint       |  2 ++
 .../camel/assembler/google-bigquery-sql-endpoint   |  2 ++
 .../GoogleCalendarEndpointUriAssembler.java        | 33 ++++++++++++++++++
 .../GoogleCalendarStreamEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../camel/assembler/google-calendar-endpoint       |  2 ++
 .../assembler/google-calendar-stream-endpoint      |  2 ++
 .../drive/GoogleDriveEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../apache/camel/assembler/google-drive-endpoint   |  2 ++
 .../mail/GoogleMailEndpointUriAssembler.java       | 33 ++++++++++++++++++
 .../GoogleMailStreamEndpointUriAssembler.java      | 32 +++++++++++++++++
 .../apache/camel/assembler/google-mail-endpoint    |  2 ++
 .../camel/assembler/google-mail-stream-endpoint    |  2 ++
 .../pubsub/GooglePubsubEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../apache/camel/assembler/google-pubsub-endpoint  |  2 ++
 .../sheets/GoogleSheetsEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../GoogleSheetsStreamEndpointUriAssembler.java    | 32 +++++++++++++++++
 .../apache/camel/assembler/google-sheets-endpoint  |  2 ++
 .../camel/assembler/google-sheets-stream-endpoint  |  2 ++
 .../component/gora/GoraEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/gora-endpoint       |  2 ++
 .../component/grape/GrapeEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/grape-endpoint      |  2 ++
 .../graphql/GraphqlEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/graphql-endpoint    |  2 ++
 .../component/grpc/GrpcEndpointUriAssembler.java   | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/grpc-endpoint       |  2 ++
 .../GuavaEventBusEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../apache/camel/assembler/guava-eventbus-endpoint |  2 ++
 .../HazelcastAtomicnumberEndpointUriAssembler.java | 32 +++++++++++++++++
 .../HazelcastInstanceEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../list/HazelcastListEndpointUriAssembler.java    | 32 +++++++++++++++++
 .../map/HazelcastMapEndpointUriAssembler.java      | 32 +++++++++++++++++
 .../HazelcastMultimapEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../queue/HazelcastQueueEndpointUriAssembler.java  | 32 +++++++++++++++++
 ...HazelcastReplicatedmapEndpointUriAssembler.java | 32 +++++++++++++++++
 .../HazelcastRingbufferEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../seda/HazelcastSedaEndpointUriAssembler.java    | 32 +++++++++++++++++
 .../set/HazelcastSetEndpointUriAssembler.java      | 32 +++++++++++++++++
 .../topic/HazelcastTopicEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../camel/assembler/hazelcast-atomicvalue-endpoint |  2 ++
 .../camel/assembler/hazelcast-instance-endpoint    |  2 ++
 .../apache/camel/assembler/hazelcast-list-endpoint |  2 ++
 .../apache/camel/assembler/hazelcast-map-endpoint  |  2 ++
 .../camel/assembler/hazelcast-multimap-endpoint    |  2 ++
 .../camel/assembler/hazelcast-queue-endpoint       |  2 ++
 .../assembler/hazelcast-replicatedmap-endpoint     |  2 ++
 .../camel/assembler/hazelcast-ringbuffer-endpoint  |  2 ++
 .../apache/camel/assembler/hazelcast-seda-endpoint |  2 ++
 .../apache/camel/assembler/hazelcast-set-endpoint  |  2 ++
 .../camel/assembler/hazelcast-topic-endpoint       |  2 ++
 .../component/hbase/HBaseEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/hbase-endpoint      |  2 ++
 .../component/hdfs/HdfsEndpointUriAssembler.java   | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/hdfs-endpoint       |  2 ++
 .../hipchat/HipchatEndpointUriAssembler.java       | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/hipchat-endpoint    |  2 ++
 .../component/http/HttpEndpointUriAssembler.java   | 38 ++++++++++++++++++++
 .../org/apache/camel/assembler/http-endpoint       |  2 ++
 .../org/apache/camel/assembler/https-endpoint      |  2 ++
 .../client/ClientEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../server/ServerEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../camel/assembler/iec60870-client-endpoint       |  2 ++
 .../camel/assembler/iec60870-server-endpoint       |  2 ++
 .../apache/camel/assembler/ignite-cache-endpoint   |  2 ++
 .../apache/camel/assembler/ignite-compute-endpoint |  2 ++
 .../apache/camel/assembler/ignite-events-endpoint  |  2 ++
 .../apache/camel/assembler/ignite-idgen-endpoint   |  2 ++
 .../camel/assembler/ignite-messaging-endpoint      |  2 ++
 .../apache/camel/assembler/ignite-queue-endpoint   |  2 ++
 .../org/apache/camel/assembler/ignite-set-endpoint |  2 ++
 .../infinispan/InfinispanEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/infinispan-endpoint |  2 ++
 .../influxdb/InfluxDbEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/influxdb-endpoint   |  2 ++
 .../component/iota/IOTAEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/iota-endpoint       |  2 ++
 .../component/ipfs/IPFSEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/ipfs-endpoint       |  2 ++
 .../component/irc/IrcEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/irc-endpoint        |  2 ++
 .../ironmq/IronMQEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/ironmq-endpoint     |  2 ++
 .../component/jbpm/JBPMEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/jbpm-endpoint       |  2 ++
 .../jcache/JCacheEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/jcache-endpoint     |  2 ++
 .../jclouds/JcloudsEndpointUriAssembler.java       | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/jclouds-endpoint    |  2 ++
 .../component/jcr/JcrEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/jcr-endpoint        |  2 ++
 .../component/jdbc/JdbcEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/jdbc-endpoint       |  2 ++
 .../raft/JGroupsRaftEndpointUriAssembler.java      | 32 +++++++++++++++++
 .../apache/camel/assembler/jgroups-raft-endpoint   |  2 ++
 .../jgroups/JGroupsEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/jgroups-endpoint    |  2 ++
 .../validator/jing/JingEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/jing-endpoint       |  2 ++
 .../component/jira/JiraEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/jira-endpoint       |  2 ++
 .../component/jms/JmsEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/jms-endpoint        |  2 ++
 .../component/jmx/JMXEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/jmx-endpoint        |  2 ++
 .../component/jolt/JoltEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/jolt-endpoint       |  2 ++
 .../component/jooq/JooqEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/jooq-endpoint       |  2 ++
 .../component/jpa/JpaEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/jpa-endpoint        |  2 ++
 .../component/scp/ScpEndpointUriAssembler.java     | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/scp-endpoint        |  2 ++
 .../component/jslt/JsltEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/jslt-endpoint       |  2 ++
 .../JsonValidatorEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../apache/camel/assembler/json-validator-endpoint |  2 ++
 .../jsonata/JsonataEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/jsonata-endpoint    |  2 ++
 .../component/jt400/Jt400EndpointUriAssembler.java | 36 +++++++++++++++++++
 .../org/apache/camel/assembler/jt400-endpoint      |  2 ++
 .../component/kafka/KafkaEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/kafka-endpoint      |  2 ++
 .../KubernetesConfigMapsEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../KubernetesDeploymentsEndpointUriAssembler.java | 32 +++++++++++++++++
 .../hpa/KubernetesHPAEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../job/KubernetesJobEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../KubernetesNamespacesEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../nodes/KubernetesNodesEndpointUriAssembler.java | 32 +++++++++++++++++
 ...netesPersistentVolumesEndpointUriAssembler.java | 32 +++++++++++++++++
 ...ersistentVolumesClaimsEndpointUriAssembler.java | 32 +++++++++++++++++
 .../pods/KubernetesPodsEndpointUriAssembler.java   | 32 +++++++++++++++++
 ...ReplicationControllersEndpointUriAssembler.java | 32 +++++++++++++++++
 ...bernetesResourcesQuotaEndpointUriAssembler.java | 32 +++++++++++++++++
 .../KubernetesSecretsEndpointUriAssembler.java     | 32 +++++++++++++++++
 ...ernetesServiceAccountsEndpointUriAssembler.java | 32 +++++++++++++++++
 .../KubernetesServicesEndpointUriAssembler.java    | 32 +++++++++++++++++
 .../OpenshiftBuildConfigsEndpointUriAssembler.java | 32 +++++++++++++++++
 .../OpenshiftBuildsEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../assembler/kubernetes-config-maps-endpoint      |  2 ++
 .../assembler/kubernetes-deployments-endpoint      |  2 ++
 .../apache/camel/assembler/kubernetes-hpa-endpoint |  2 ++
 .../apache/camel/assembler/kubernetes-job-endpoint |  2 ++
 .../camel/assembler/kubernetes-namespaces-endpoint |  2 ++
 .../camel/assembler/kubernetes-nodes-endpoint      |  2 ++
 .../kubernetes-persistent-volumes-claims-endpoint  |  2 ++
 .../kubernetes-persistent-volumes-endpoint         |  2 ++
 .../camel/assembler/kubernetes-pods-endpoint       |  2 ++
 .../kubernetes-replication-controllers-endpoint    |  2 ++
 .../assembler/kubernetes-resources-quota-endpoint  |  2 ++
 .../camel/assembler/kubernetes-secrets-endpoint    |  2 ++
 .../assembler/kubernetes-service-accounts-endpoint |  2 ++
 .../camel/assembler/kubernetes-services-endpoint   |  2 ++
 .../assembler/openshift-build-configs-endpoint     |  2 ++
 .../camel/assembler/openshift-builds-endpoint      |  2 ++
 .../component/kudu/KuduEndpointUriAssembler.java   | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/kudu-endpoint       |  2 ++
 .../language/LanguageEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/language-endpoint   |  2 ++
 .../component/ldap/LdapEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/ldap-endpoint       |  2 ++
 .../component/ldif/LdifEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/ldif-endpoint       |  2 ++
 .../lucene/LuceneEndpointUriAssembler.java         | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/lucene-endpoint     |  2 ++
 .../lumberjack/LumberjackEndpointUriAssembler.java | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/lumberjack-endpoint |  2 ++
 .../master/MasterEndpointUriAssembler.java         | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/master-endpoint     |  2 ++
 .../metrics/MetricsEndpointUriAssembler.java       | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/metrics-endpoint    |  2 ++
 .../micrometer/MicrometerEndpointUriAssembler.java | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/micrometer-endpoint |  2 ++
 .../MicroProfileMetricsEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../camel/assembler/microprofile-metrics-endpoint  |  2 ++
 .../client/MiloClientEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../server/MiloServerEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../apache/camel/assembler/milo-client-endpoint    |  2 ++
 .../apache/camel/assembler/milo-server-endpoint    |  2 ++
 .../component/mina/MinaEndpointUriAssembler.java   | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/mina-endpoint       |  2 ++
 .../component/minio/MinioEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/minio-endpoint      |  2 ++
 .../component/mllp/MllpEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/mllp-endpoint       |  2 ++
 .../component/mock/MockEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/mock-endpoint       |  2 ++
 .../mongodb/gridfs/GridFsEndpointUriAssembler.java | 32 +++++++++++++++++
 .../apache/camel/assembler/mongodb-gridfs-endpoint |  2 ++
 .../mongodb/MongoDbEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/mongodb-endpoint    |  2 ++
 .../validator/msv/MsvEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/msv-endpoint        |  2 ++
 .../mustache/MustacheEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/mustache-endpoint   |  2 ++
 .../component/mvel/MvelEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/mvel-endpoint       |  2 ++
 .../mybatis/MyBatisBeanEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../mybatis/MyBatisEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../apache/camel/assembler/mybatis-bean-endpoint   |  2 ++
 .../org/apache/camel/assembler/mybatis-endpoint    |  2 ++
 .../nagios/NagiosEndpointUriAssembler.java         | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/nagios-endpoint     |  2 ++
 .../component/nats/NatsEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/nats-endpoint       |  2 ++
 .../component/netty/NettyEndpointUriAssembler.java | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/netty-endpoint      |  2 ++
 .../nitrite/NitriteEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/nitrite-endpoint    |  2 ++
 .../component/nsq/NsqEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/nsq-endpoint        |  2 ++
 .../component/OAIPMHEndpointUriAssembler.java      | 32 +++++++++++++++++
 .../org/apache/camel/assembler/oaipmh-endpoint     |  2 ++
 .../olingo2/Olingo2EndpointUriAssembler.java       | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/olingo2-endpoint    |  2 ++
 .../olingo4/Olingo4EndpointUriAssembler.java       | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/olingo4-endpoint    |  2 ++
 .../cinder/CinderEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../glance/GlanceEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../keystone/KeystoneEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../neutron/NeutronEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../openstack/nova/NovaEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../openstack/swift/SwiftEndpointUriAssembler.java | 32 +++++++++++++++++
 .../camel/assembler/openstack-cinder-endpoint      |  2 ++
 .../camel/assembler/openstack-glance-endpoint      |  2 ++
 .../camel/assembler/openstack-keystone-endpoint    |  2 ++
 .../camel/assembler/openstack-neutron-endpoint     |  2 ++
 .../apache/camel/assembler/openstack-nova-endpoint |  2 ++
 .../camel/assembler/openstack-swift-endpoint       |  2 ++
 .../OptaPlannerEndpointUriAssembler.java           | 32 +++++++++++++++++
 .../apache/camel/assembler/optaplanner-endpoint    |  2 ++
 .../component/paho/PahoEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/paho-endpoint       |  2 ++
 .../component/pdf/PdfEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/pdf-endpoint        |  2 ++
 .../PgReplicationSlotEndpointUriAssembler.java     | 36 +++++++++++++++++++
 .../camel/assembler/pg-replication-slot-endpoint   |  2 ++
 .../pgevent/PgEventEndpointUriAssembler.java       | 35 +++++++++++++++++++
 .../org/apache/camel/assembler/pgevent-endpoint    |  2 ++
 .../http/PlatformHttpEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../apache/camel/assembler/platform-http-endpoint  |  2 ++
 .../printer/PrinterEndpointUriAssembler.java       | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/lpr-endpoint        |  2 ++
 .../pubnub/PubNubEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/pubnub-endpoint     |  2 ++
 .../pulsar/PulsarEndpointUriAssembler.java         | 35 +++++++++++++++++++
 .../org/apache/camel/assembler/pulsar-endpoint     |  2 ++
 .../quartz/QuartzEndpointUriAssembler.java         | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/quartz-endpoint     |  2 ++
 .../quickfixj/QuickfixjEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/quickfix-endpoint   |  2 ++
 .../rabbitmq/RabbitMQEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/rabbitmq-endpoint   |  2 ++
 .../ReactiveStreamsEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../camel/assembler/reactive-streams-endpoint      |  2 ++
 .../component/ref/RefEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/ref-endpoint        |  2 ++
 .../openapi/RestOpenApiEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../apache/camel/assembler/rest-openapi-endpoint   |  2 ++
 .../swagger/RestSwaggerEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../apache/camel/assembler/rest-swagger-endpoint   |  2 ++
 .../rest/RestApiEndpointUriAssembler.java          | 33 ++++++++++++++++++
 .../component/rest/RestEndpointUriAssembler.java   | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/rest-api-endpoint   |  2 ++
 .../org/apache/camel/assembler/rest-endpoint       |  2 ++
 .../resteasy/ResteasyEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/resteasy-endpoint   |  2 ++
 .../RobotFrameworkEndpointUriAssembler.java        | 32 +++++++++++++++++
 .../apache/camel/assembler/robotframework-endpoint |  2 ++
 .../component/rss/RssEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/rss-endpoint        |  2 ++
 .../component/saga/SagaEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/saga-endpoint       |  2 ++
 .../salesforce/SalesforceEndpointUriAssembler.java | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/salesforce-endpoint |  2 ++
 .../netweaver/NetWeaverEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../apache/camel/assembler/sap-netweaver-endpoint  |  2 ++
 .../xquery/XQueryEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/xquery-endpoint     |  2 ++
 .../scheduler/SchedulerEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/scheduler-endpoint  |  2 ++
 .../schematron/SchematronEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/schematron-endpoint |  2 ++
 .../component/seda/SedaEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/seda-endpoint       |  2 ++
 .../service/ServiceEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/service-endpoint    |  2 ++
 .../servicenow/ServiceNowEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/servicenow-endpoint |  2 ++
 .../servlet/ServletEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/servlet-endpoint    |  2 ++
 .../component/sip/SipEndpointUriAssembler.java     | 38 ++++++++++++++++++++
 .../org/apache/camel/assembler/sip-endpoint        |  2 ++
 .../org/apache/camel/assembler/sips-endpoint       |  2 ++
 .../component/sjms/SjmsEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../sjms/batch/SjmsBatchEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../org/apache/camel/assembler/sjms-batch-endpoint |  2 ++
 .../org/apache/camel/assembler/sjms-endpoint       |  2 ++
 .../component/sjms2/Sjms2EndpointUriAssembler.java | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/sjms2-endpoint      |  2 ++
 .../component/slack/SlackEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/slack-endpoint      |  2 ++
 .../component/smpp/SmppEndpointUriAssembler.java   | 39 +++++++++++++++++++++
 .../org/apache/camel/assembler/smpp-endpoint       |  2 ++
 .../org/apache/camel/assembler/smpps-endpoint      |  2 ++
 .../component/snmp/SnmpEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/snmp-endpoint       |  2 ++
 .../component/solr/SolrEndpointUriAssembler.java   | 38 ++++++++++++++++++++
 .../org/apache/camel/assembler/solr-endpoint       |  2 ++
 .../org/apache/camel/assembler/solrCloud-endpoint  |  2 ++
 .../org/apache/camel/assembler/solrs-endpoint      |  2 ++
 .../component/SoroushBotEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../org/apache/camel/assembler/soroush-endpoint    |  2 ++
 .../component/spark/SparkEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/spark-endpoint      |  2 ++
 .../splunkhec/SplunkHECEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/splunk-hec-endpoint |  2 ++
 .../splunk/SplunkEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/splunk-endpoint     |  2 ++
 .../batch/SpringBatchEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../apache/camel/assembler/spring-batch-endpoint   |  2 ++
 .../SpringIntegrationEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../camel/assembler/spring-integration-endpoint    |  2 ++
 .../springldap/SpringLdapEndpointUriAssembler.java | 32 +++++++++++++++++
 .../apache/camel/assembler/spring-ldap-endpoint    |  2 ++
 .../component/redis/RedisEndpointUriAssembler.java | 33 ++++++++++++++++++
 .../apache/camel/assembler/spring-redis-endpoint   |  2 ++
 .../ws/SpringWebserviceEndpointUriAssembler.java   | 35 +++++++++++++++++++
 .../org/apache/camel/assembler/spring-ws-endpoint  |  2 ++
 .../component/event/EventEndpointUriAssembler.java | 32 +++++++++++++++++
 .../apache/camel/assembler/spring-event-endpoint   |  2 ++
 .../component/sql/SqlEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../sql/stored/SqlStoredEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../org/apache/camel/assembler/sql-endpoint        |  2 ++
 .../org/apache/camel/assembler/sql-stored-endpoint |  2 ++
 .../component/ssh/SshEndpointUriAssembler.java     | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/ssh-endpoint        |  2 ++
 .../component/stax/StAXEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/stax-endpoint       |  2 ++
 .../component/stomp/StompEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/stomp-endpoint      |  2 ++
 .../stream/StreamEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/stream-endpoint     |  2 ++
 .../StringTemplateEndpointUriAssembler.java        | 32 +++++++++++++++++
 .../camel/assembler/string-template-endpoint       |  2 ++
 .../component/stub/StubEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/stub-endpoint       |  2 ++
 .../telegram/TelegramEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/telegram-endpoint   |  2 ++
 .../thrift/ThriftEndpointUriAssembler.java         | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/thrift-endpoint     |  2 ++
 .../component/tika/TikaEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/tika-endpoint       |  2 ++
 .../component/timer/TimerEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/timer-endpoint      |  2 ++
 .../twilio/TwilioEndpointUriAssembler.java         | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/twilio-endpoint     |  2 ++
 .../TwitterDirectMessageEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../search/TwitterSearchEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../TwitterTimelineEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../camel/assembler/twitter-directmessage-endpoint |  2 ++
 .../apache/camel/assembler/twitter-search-endpoint |  2 ++
 .../camel/assembler/twitter-timeline-endpoint      |  2 ++
 .../undertow/UndertowEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/undertow-endpoint   |  2 ++
 .../validator/ValidatorEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/validator-endpoint  |  2 ++
 .../velocity/VelocityEndpointUriAssembler.java     | 32 +++++++++++++++++
 .../org/apache/camel/assembler/velocity-endpoint   |  2 ++
 .../vertx/http/VertxHttpEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../org/apache/camel/assembler/vertx-http-endpoint |  2 ++
 .../VertxWebsocketEndpointUriAssembler.java        | 34 ++++++++++++++++++
 .../camel/assembler/vertx-websocket-endpoint       |  2 ++
 .../component/vertx/VertxEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/vertx-endpoint      |  2 ++
 .../camel/component/vm/VmEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/vm-endpoint         |  2 ++
 .../weather/WeatherEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/weather-endpoint    |  2 ++
 .../component/web3j/Web3jEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/web3j-endpoint      |  2 ++
 .../webhook/WebhookEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/webhook-endpoint    |  2 ++
 .../JSR356WebSocketEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../camel/assembler/websocket-jsr356-endpoint      |  2 ++
 .../websocket/WebsocketEndpointUriAssembler.java   | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/websocket-endpoint  |  2 ++
 .../component/weka/WekaEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/weka-endpoint       |  2 ++
 .../wordpress/WordpressEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/wordpress-endpoint  |  2 ++
 .../workday/WorkdayEndpointUriAssembler.java       | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/workday-endpoint    |  2 ++
 .../xchange/XChangeEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/xchange-endpoint    |  2 ++
 .../camel/component/xj/XJEndpointUriAssembler.java | 32 +++++++++++++++++
 .../org/apache/camel/assembler/xj-endpoint         |  2 ++
 .../xmlsecurity/XmlSignerEndpointUriAssembler.java | 32 +++++++++++++++++
 .../XmlVerifierEndpointUriAssembler.java           | 32 +++++++++++++++++
 .../camel/assembler/xmlsecurity-sign-endpoint      |  2 ++
 .../camel/assembler/xmlsecurity-verify-endpoint    |  2 ++
 .../component/xmpp/XmppEndpointUriAssembler.java   | 34 ++++++++++++++++++
 .../org/apache/camel/assembler/xmpp-endpoint       |  2 ++
 .../xslt/saxon/XsltSaxonEndpointUriAssembler.java  | 32 +++++++++++++++++
 .../org/apache/camel/assembler/xslt-saxon-endpoint |  2 ++
 .../component/xslt/XsltEndpointUriAssembler.java   | 32 +++++++++++++++++
 .../org/apache/camel/assembler/xslt-endpoint       |  2 ++
 .../yammer/YammerEndpointUriAssembler.java         | 32 +++++++++++++++++
 .../org/apache/camel/assembler/yammer-endpoint     |  2 ++
 .../zendesk/ZendeskEndpointUriAssembler.java       | 32 +++++++++++++++++
 .../org/apache/camel/assembler/zendesk-endpoint    |  2 ++
 .../MasterEndpointUriAssembler.java                | 33 ++++++++++++++++++
 .../camel/assembler/zookeeper-master-endpoint      |  2 ++
 .../zookeeper/ZooKeeperEndpointUriAssembler.java   | 33 ++++++++++++++++++
 .../org/apache/camel/assembler/zookeeper-endpoint  |  2 ++
 680 files changed, 11484 insertions(+), 4 deletions(-)

diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java
new file mode 100644
index 0000000..4671bbe
--- /dev/null
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.activemq;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ActiveMQEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":destinationType:destinationName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "activemq".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/assembler/activemq-endpoint b/components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/assembler/activemq-endpoint
new file mode 100644
index 0000000..a79f5f7
--- /dev/null
+++ b/components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/assembler/activemq-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.activemq.ActiveMQEndpointUriAssembler
diff --git a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java
new file mode 100644
index 0000000..6764a7b
--- /dev/null
+++ b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java
@@ -0,0 +1,38 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.ahc.ws;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class WsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":httpUri";
+    private static final String[] SCHEMES = new String[]{"ahc-ws", "ahc-wss"};
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        for (String s : SCHEMES) {
+            if (s.equals(scheme)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/assembler/ahc-ws-endpoint b/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/assembler/ahc-ws-endpoint
new file mode 100644
index 0000000..91b95ac1
--- /dev/null
+++ b/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/assembler/ahc-ws-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ahc.ws.WsEndpointUriAssembler
diff --git a/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/assembler/ahc-wss-endpoint b/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/assembler/ahc-wss-endpoint
new file mode 100644
index 0000000..91b95ac1
--- /dev/null
+++ b/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/assembler/ahc-wss-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ahc.ws.WsEndpointUriAssembler
diff --git a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java
new file mode 100644
index 0000000..5423476
--- /dev/null
+++ b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.amqp;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AMQPEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":destinationType:destinationName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "amqp".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/assembler/amqp-endpoint b/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/assembler/amqp-endpoint
new file mode 100644
index 0000000..cc53903
--- /dev/null
+++ b/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/assembler/amqp-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.amqp.AMQPEndpointUriAssembler
diff --git a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java
new file mode 100644
index 0000000..d852895
--- /dev/null
+++ b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.apns;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ApnsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "apns".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-apns/src/generated/resources/META-INF/services/org/apache/camel/assembler/apns-endpoint b/components/camel-apns/src/generated/resources/META-INF/services/org/apache/camel/assembler/apns-endpoint
new file mode 100644
index 0000000..6c2a629
--- /dev/null
+++ b/components/camel-apns/src/generated/resources/META-INF/services/org/apache/camel/assembler/apns-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.apns.ApnsEndpointUriAssembler
diff --git a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java
new file mode 100644
index 0000000..7edca8a
--- /dev/null
+++ b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.arangodb;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ArangoDbEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":database";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "arangodb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/assembler/arangodb-endpoint b/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/assembler/arangodb-endpoint
new file mode 100644
index 0000000..1826326
--- /dev/null
+++ b/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/assembler/arangodb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.arangodb.ArangoDbEndpointUriAssembler
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java
new file mode 100644
index 0000000..17c1d7b
--- /dev/null
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.as2;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AS2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":apiName/methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "as2".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-as2/camel-as2-component/src/generated/resources/META-INF/services/org/apache/camel/assembler/as2-endpoint b/components/camel-as2/camel-as2-component/src/generated/resources/META-INF/services/org/apache/camel/assembler/as2-endpoint
new file mode 100644
index 0000000..b5a3ca1
--- /dev/null
+++ b/components/camel-as2/camel-as2-component/src/generated/resources/META-INF/services/org/apache/camel/assembler/as2-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.as2.AS2EndpointUriAssembler
diff --git a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java
new file mode 100644
index 0000000..4a507e0
--- /dev/null
+++ b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.asterisk;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AsteriskEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "asterisk".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-asterisk/src/generated/resources/META-INF/services/org/apache/camel/assembler/asterisk-endpoint b/components/camel-asterisk/src/generated/resources/META-INF/services/org/apache/camel/assembler/asterisk-endpoint
new file mode 100644
index 0000000..3c99e75
--- /dev/null
+++ b/components/camel-asterisk/src/generated/resources/META-INF/services/org/apache/camel/assembler/asterisk-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.asterisk.AsteriskEndpointUriAssembler
diff --git a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java
new file mode 100644
index 0000000..0972370
--- /dev/null
+++ b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atmos;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtmosEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name/operation";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atmos".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atmos/src/generated/resources/META-INF/services/org/apache/camel/assembler/atmos-endpoint b/components/camel-atmos/src/generated/resources/META-INF/services/org/apache/camel/assembler/atmos-endpoint
new file mode 100644
index 0000000..cdabeba
--- /dev/null
+++ b/components/camel-atmos/src/generated/resources/META-INF/services/org/apache/camel/assembler/atmos-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atmos.AtmosEndpointUriAssembler
diff --git a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java
new file mode 100644
index 0000000..2830237
--- /dev/null
+++ b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atmosphere.websocket;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class WebsocketEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":servicePath";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atmosphere-websocket".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "servicePath", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atmosphere-websocket/src/generated/resources/META-INF/services/org/apache/camel/assembler/atmosphere-websocket-endpoint b/components/camel-atmosphere-websocket/src/generated/resources/META-INF/services/org/apache/camel/assembler/atmosphere-websocket-endpoint
new file mode 100644
index 0000000..0ad86c3
--- /dev/null
+++ b/components/camel-atmosphere-websocket/src/generated/resources/META-INF/services/org/apache/camel/assembler/atmosphere-websocket-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atmosphere.websocket.WebsocketEndpointUriAssembler
diff --git a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java
new file mode 100644
index 0000000..e63cd46
--- /dev/null
+++ b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atom;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":feedUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atom".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "feedUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/assembler/atom-endpoint b/components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/assembler/atom-endpoint
new file mode 100644
index 0000000..77a0027
--- /dev/null
+++ b/components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/assembler/atom-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atom.AtomEndpointUriAssembler
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java
new file mode 100644
index 0000000..906d060
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.map;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixMapEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-map".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java
new file mode 100644
index 0000000..870f2ec
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.messaging;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixMessagingEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-messaging".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java
new file mode 100644
index 0000000..61fce2d
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.multimap;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixMultiMapEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-multimap".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java
new file mode 100644
index 0000000..c5963c0
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.queue;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixQueueEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-queue".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java
new file mode 100644
index 0000000..6b1c0a5
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.set;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixSetEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-set".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java
new file mode 100644
index 0000000..efede6b
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.value;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixValueEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-value".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-map-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-map-endpoint
new file mode 100644
index 0000000..3c1a7ad
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-map-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.map.AtomixMapEndpointUriAssembler
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-messaging-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-messaging-endpoint
new file mode 100644
index 0000000..7623692
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-messaging-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.messaging.AtomixMessagingEndpointUriAssembler
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-multimap-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-multimap-endpoint
new file mode 100644
index 0000000..8ecacda
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-multimap-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.multimap.AtomixMultiMapEndpointUriAssembler
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-queue-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-queue-endpoint
new file mode 100644
index 0000000..b35ee87
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-queue-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.queue.AtomixQueueEndpointUriAssembler
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-set-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-set-endpoint
new file mode 100644
index 0000000..2ac08dd
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-set-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.set.AtomixSetEndpointUriAssembler
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-value-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-value-endpoint
new file mode 100644
index 0000000..11d98d1
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/assembler/atomix-value-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.value.AtomixValueEndpointUriAssembler
diff --git a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java
new file mode 100644
index 0000000..a2b7b71
--- /dev/null
+++ b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.avro;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AvroEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":transport:host:port/messageName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "avro".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "transport", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "messageName", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-avro-rpc/src/generated/resources/META-INF/services/org/apache/camel/assembler/avro-endpoint b/components/camel-avro-rpc/src/generated/resources/META-INF/services/org/apache/camel/assembler/avro-endpoint
new file mode 100644
index 0000000..44fc74c
--- /dev/null
+++ b/components/camel-avro-rpc/src/generated/resources/META-INF/services/org/apache/camel/assembler/avro-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.avro.AvroEndpointUriAssembler
diff --git a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java
new file mode 100644
index 0000000..46c9466
--- /dev/null
+++ b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.cw;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CwEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":namespace";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-cw".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-cw/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-cw-endpoint b/components/camel-aws-cw/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-cw-endpoint
new file mode 100644
index 0000000..1169f88
--- /dev/null
+++ b/components/camel-aws-cw/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-cw-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.cw.CwEndpointUriAssembler
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java
new file mode 100644
index 0000000..f9a3f4b
--- /dev/null
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.ddb;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DdbEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":tableName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-ddb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java
new file mode 100644
index 0000000..ca84076
--- /dev/null
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.ddbstream;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DdbStreamEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":tableName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-ddbstream".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ddb-endpoint b/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ddb-endpoint
new file mode 100644
index 0000000..96e7b71
--- /dev/null
+++ b/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ddb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.ddb.DdbEndpointUriAssembler
diff --git a/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ddbstream-endpoint b/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ddbstream-endpoint
new file mode 100644
index 0000000..0f5db5a
--- /dev/null
+++ b/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ddbstream-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.ddbstream.DdbStreamEndpointUriAssembler
diff --git a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java
new file mode 100644
index 0000000..3d51764
--- /dev/null
+++ b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.ec2;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EC2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-ec2".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-ec2/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ec2-endpoint b/components/camel-aws-ec2/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ec2-endpoint
new file mode 100644
index 0000000..e4b8490
--- /dev/null
+++ b/components/camel-aws-ec2/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ec2-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.ec2.EC2EndpointUriAssembler
diff --git a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java
new file mode 100644
index 0000000..b45fe74
--- /dev/null
+++ b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.ecs;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ECSEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-ecs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-ecs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ecs-endpoint b/components/camel-aws-ecs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ecs-endpoint
new file mode 100644
index 0000000..f85aba3
--- /dev/null
+++ b/components/camel-aws-ecs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ecs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.ecs.ECSEndpointUriAssembler
diff --git a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java
new file mode 100644
index 0000000..c131bbe
--- /dev/null
+++ b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.eks;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EKSEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-eks".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-eks/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-eks-endpoint b/components/camel-aws-eks/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-eks-endpoint
new file mode 100644
index 0000000..c90f6ac
--- /dev/null
+++ b/components/camel-aws-eks/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-eks-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.eks.EKSEndpointUriAssembler
diff --git a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java
new file mode 100644
index 0000000..a26ed2a
--- /dev/null
+++ b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.iam;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class IAMEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-iam".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-iam/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-iam-endpoint b/components/camel-aws-iam/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-iam-endpoint
new file mode 100644
index 0000000..0d6a9bd
--- /dev/null
+++ b/components/camel-aws-iam/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-iam-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.iam.IAMEndpointUriAssembler
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java
new file mode 100644
index 0000000..067ede1
--- /dev/null
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.firehose;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KinesisFirehoseEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":streamName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-kinesis-firehose".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java
new file mode 100644
index 0000000..effadeaf
--- /dev/null
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.kinesis;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KinesisEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":streamName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-kinesis".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-kinesis-endpoint b/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-kinesis-endpoint
new file mode 100644
index 0000000..b188e38
--- /dev/null
+++ b/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-kinesis-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.kinesis.KinesisEndpointUriAssembler
diff --git a/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-kinesis-firehose-endpoint b/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-kinesis-firehose-endpoint
new file mode 100644
index 0000000..e5fe98e
--- /dev/null
+++ b/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-kinesis-firehose-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.firehose.KinesisFirehoseEndpointUriAssembler
diff --git a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java
new file mode 100644
index 0000000..19d8e95
--- /dev/null
+++ b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.kms;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KMSEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-kms".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-kms/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-kms-endpoint b/components/camel-aws-kms/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-kms-endpoint
new file mode 100644
index 0000000..1b598e9
--- /dev/null
+++ b/components/camel-aws-kms/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-kms-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.kms.KMSEndpointUriAssembler
diff --git a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java
new file mode 100644
index 0000000..ef1ac73
--- /dev/null
+++ b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.lambda;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class LambdaEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":function";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-lambda".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-lambda/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-lambda-endpoint b/components/camel-aws-lambda/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-lambda-endpoint
new file mode 100644
index 0000000..1ca716e
--- /dev/null
+++ b/components/camel-aws-lambda/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-lambda-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.lambda.LambdaEndpointUriAssembler
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java
new file mode 100644
index 0000000..bcdd8f9
--- /dev/null
+++ b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.mq;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class MQEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-mq".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-mq-endpoint b/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-mq-endpoint
new file mode 100644
index 0000000..8fee78f
--- /dev/null
+++ b/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-mq-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.mq.MQEndpointUriAssembler
diff --git a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java
new file mode 100644
index 0000000..1e3ad07
--- /dev/null
+++ b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.msk;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class MSKEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-msk".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-msk/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-msk-endpoint b/components/camel-aws-msk/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-msk-endpoint
new file mode 100644
index 0000000..b16feb7
--- /dev/null
+++ b/components/camel-aws-msk/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-msk-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.msk.MSKEndpointUriAssembler
diff --git a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java
new file mode 100644
index 0000000..8bc6e3b
--- /dev/null
+++ b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.s3;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class S3EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = "://bucketNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-s3".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-s3/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-s3-endpoint b/components/camel-aws-s3/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-s3-endpoint
new file mode 100644
index 0000000..12f3825
--- /dev/null
+++ b/components/camel-aws-s3/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-s3-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.s3.S3EndpointUriAssembler
diff --git a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java
new file mode 100644
index 0000000..1cf9461
--- /dev/null
+++ b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.sdb;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class SdbEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":domainName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-sdb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "domainName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-sdb-endpoint b/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-sdb-endpoint
new file mode 100644
index 0000000..619a58c
--- /dev/null
+++ b/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-sdb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.sdb.SdbEndpointUriAssembler
diff --git a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java
new file mode 100644
index 0000000..80c67e3
--- /dev/null
+++ b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.ses;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class SesEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":from";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-ses".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-ses/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ses-endpoint b/components/camel-aws-ses/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ses-endpoint
new file mode 100644
index 0000000..188344b
--- /dev/null
+++ b/components/camel-aws-ses/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-ses-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.ses.SesEndpointUriAssembler
diff --git a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java
new file mode 100644
index 0000000..586c8b0
--- /dev/null
+++ b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.sns;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class SnsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":topicNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-sns".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-sns/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-sns-endpoint b/components/camel-aws-sns/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-sns-endpoint
new file mode 100644
index 0000000..ed80e9e
--- /dev/null
+++ b/components/camel-aws-sns/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-sns-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.sns.SnsEndpointUriAssembler
diff --git a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java
new file mode 100644
index 0000000..78b7b8d
--- /dev/null
+++ b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.sqs;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class SqsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":queueNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-sqs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-sqs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-sqs-endpoint b/components/camel-aws-sqs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-sqs-endpoint
new file mode 100644
index 0000000..1e27812
--- /dev/null
+++ b/components/camel-aws-sqs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-sqs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.sqs.SqsEndpointUriAssembler
diff --git a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java
new file mode 100644
index 0000000..67b88e7
--- /dev/null
+++ b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.swf;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class SWFEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":type";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-swf".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-swf/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-swf-endpoint b/components/camel-aws-swf/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-swf-endpoint
new file mode 100644
index 0000000..2ed1f3d
--- /dev/null
+++ b/components/camel-aws-swf/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-swf-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.swf.SWFEndpointUriAssembler
diff --git a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java
new file mode 100644
index 0000000..c28c78a
--- /dev/null
+++ b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.translate;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class TranslateEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-translate".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-translate/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-translate-endpoint b/components/camel-aws-translate/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-translate-endpoint
new file mode 100644
index 0000000..b867e84
--- /dev/null
+++ b/components/camel-aws-translate/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws-translate-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.translate.TranslateEndpointUriAssembler
diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java
new file mode 100644
index 0000000..d5df9c4
--- /dev/null
+++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.athena;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Athena2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-athena".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-athena/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-athena-endpoint b/components/camel-aws2-athena/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-athena-endpoint
new file mode 100644
index 0000000..e1d1c34
--- /dev/null
+++ b/components/camel-aws2-athena/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-athena-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.athena.Athena2EndpointUriAssembler
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java
new file mode 100644
index 0000000..05a49f1
--- /dev/null
+++ b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.cw;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Cw2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":namespace";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-cw".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-cw-endpoint b/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-cw-endpoint
new file mode 100644
index 0000000..d2d006d
--- /dev/null
+++ b/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-cw-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.cw.Cw2EndpointUriAssembler
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java
new file mode 100644
index 0000000..b318ad9
--- /dev/null
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.ddb;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Ddb2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":tableName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-ddb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java
new file mode 100644
index 0000000..c45a645
--- /dev/null
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.ddbstream;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Ddb2StreamEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":tableName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-ddbstream".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ddb-endpoint b/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ddb-endpoint
new file mode 100644
index 0000000..1f98839
--- /dev/null
+++ b/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ddb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.ddb.Ddb2EndpointUriAssembler
diff --git a/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ddbstream-endpoint b/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ddbstream-endpoint
new file mode 100644
index 0000000..3adb97c5
--- /dev/null
+++ b/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ddbstream-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.ddbstream.Ddb2StreamEndpointUriAssembler
diff --git a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java
new file mode 100644
index 0000000..610b691
--- /dev/null
+++ b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.ec2;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AWS2EC2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-ec2".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-ec2/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ec2-endpoint b/components/camel-aws2-ec2/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ec2-endpoint
new file mode 100644
index 0000000..a3c1db0
--- /dev/null
+++ b/components/camel-aws2-ec2/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ec2-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.ec2.AWS2EC2EndpointUriAssembler
diff --git a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java
new file mode 100644
index 0000000..4280abb
--- /dev/null
+++ b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.ecs;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ECS2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-ecs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ecs-endpoint b/components/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ecs-endpoint
new file mode 100644
index 0000000..61b3988
--- /dev/null
+++ b/components/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ecs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.ecs.ECS2EndpointUriAssembler
diff --git a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java
new file mode 100644
index 0000000..949ff4d
--- /dev/null
+++ b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.eks;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EKS2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-eks".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-eks/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-eks-endpoint b/components/camel-aws2-eks/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-eks-endpoint
new file mode 100644
index 0000000..f2f384b
--- /dev/null
+++ b/components/camel-aws2-eks/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-eks-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.eks.EKS2EndpointUriAssembler
diff --git a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
index 088da23..b69f6c9 100644
--- a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
+++ b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
@@ -6,17 +6,27 @@ import java.util.Map;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
-import org.apache.camel.component.aws2.eventbridge.EventbridgeComponent;
 
 /**
  * Generated by camel build tools - do NOT edit this file!
  */
-@SuppressWarnings("unchecked")
 public class EventbridgeEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
 
+    private static final String BASE = "://eventbusNameOrArn";
+
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) throws URISyntaxException {
-        return null;
+    public boolean isEnabled(String scheme) {
+        return "aws2-eventbridge".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "eventbusNameOrArn", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
     }
 }
 
diff --git a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java
new file mode 100644
index 0000000..1e12eaa
--- /dev/null
+++ b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.iam;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class IAM2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-iam".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-iam/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-iam-endpoint b/components/camel-aws2-iam/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-iam-endpoint
new file mode 100644
index 0000000..2c09bdf
--- /dev/null
+++ b/components/camel-aws2-iam/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-iam-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.iam.IAM2EndpointUriAssembler
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java
new file mode 100644
index 0000000..bb0f2b5
--- /dev/null
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.firehose;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KinesisFirehose2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":streamName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-kinesis-firehose".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java
new file mode 100644
index 0000000..d6b86c8
--- /dev/null
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.kinesis;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Kinesis2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":streamName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-kinesis".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-kinesis-endpoint b/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-kinesis-endpoint
new file mode 100644
index 0000000..e885803
--- /dev/null
+++ b/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-kinesis-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.kinesis.Kinesis2EndpointUriAssembler
diff --git a/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-kinesis-firehose-endpoint b/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-kinesis-firehose-endpoint
new file mode 100644
index 0000000..a9c5c99
--- /dev/null
+++ b/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-kinesis-firehose-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.firehose.KinesisFirehose2EndpointUriAssembler
diff --git a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java
new file mode 100644
index 0000000..e6163f3
--- /dev/null
+++ b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.kms;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KMS2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-kms".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-kms/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-kms-endpoint b/components/camel-aws2-kms/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-kms-endpoint
new file mode 100644
index 0000000..7264bda
--- /dev/null
+++ b/components/camel-aws2-kms/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-kms-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.kms.KMS2EndpointUriAssembler
diff --git a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java
new file mode 100644
index 0000000..53ec894
--- /dev/null
+++ b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.lambda;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Lambda2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":function";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-lambda".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-lambda/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-lambda-endpoint b/components/camel-aws2-lambda/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-lambda-endpoint
new file mode 100644
index 0000000..f88efa6
--- /dev/null
+++ b/components/camel-aws2-lambda/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-lambda-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.lambda.Lambda2EndpointUriAssembler
diff --git a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java
new file mode 100644
index 0000000..cee88a2
--- /dev/null
+++ b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.mq;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class MQ2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-mq".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-mq/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-mq-endpoint b/components/camel-aws2-mq/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-mq-endpoint
new file mode 100644
index 0000000..022802e
--- /dev/null
+++ b/components/camel-aws2-mq/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-mq-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.mq.MQ2EndpointUriAssembler
diff --git a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java
new file mode 100644
index 0000000..baf926c
--- /dev/null
+++ b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.msk;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class MSK2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-msk".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-msk/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-msk-endpoint b/components/camel-aws2-msk/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-msk-endpoint
new file mode 100644
index 0000000..b83d766
--- /dev/null
+++ b/components/camel-aws2-msk/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-msk-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.msk.MSK2EndpointUriAssembler
diff --git a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java
new file mode 100644
index 0000000..7762754
--- /dev/null
+++ b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.s3;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AWS2S3EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = "://bucketNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-s3".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-s3-endpoint b/components/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-s3-endpoint
new file mode 100644
index 0000000..c6af8dc
--- /dev/null
+++ b/components/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-s3-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.s3.AWS2S3EndpointUriAssembler
diff --git a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java
new file mode 100644
index 0000000..58fc2c5
--- /dev/null
+++ b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.ses;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Ses2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":from";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-ses".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-ses/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ses-endpoint b/components/camel-aws2-ses/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ses-endpoint
new file mode 100644
index 0000000..3d9e320
--- /dev/null
+++ b/components/camel-aws2-ses/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-ses-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.ses.Ses2EndpointUriAssembler
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java
new file mode 100644
index 0000000..4b90fab
--- /dev/null
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.sns;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Sns2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":topicNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-sns".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-sns/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-sns-endpoint b/components/camel-aws2-sns/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-sns-endpoint
new file mode 100644
index 0000000..98503c7
--- /dev/null
+++ b/components/camel-aws2-sns/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-sns-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.sns.Sns2EndpointUriAssembler
diff --git a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java
new file mode 100644
index 0000000..ddf85ce
--- /dev/null
+++ b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.sqs;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Sqs2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":queueNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-sqs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-sqs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-sqs-endpoint b/components/camel-aws2-sqs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-sqs-endpoint
new file mode 100644
index 0000000..03a6f77
--- /dev/null
+++ b/components/camel-aws2-sqs/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-sqs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.sqs.Sqs2EndpointUriAssembler
diff --git a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java
new file mode 100644
index 0000000..dfc163d
--- /dev/null
+++ b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.sts;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class STS2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-sts".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-sts/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-sts-endpoint b/components/camel-aws2-sts/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-sts-endpoint
new file mode 100644
index 0000000..0087071
--- /dev/null
+++ b/components/camel-aws2-sts/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-sts-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.sts.STS2EndpointUriAssembler
diff --git a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java
new file mode 100644
index 0000000..24da733
--- /dev/null
+++ b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.translate;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Translate2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-translate".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-translate/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-translate-endpoint b/components/camel-aws2-translate/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-translate-endpoint
new file mode 100644
index 0000000..d55b29f
--- /dev/null
+++ b/components/camel-aws2-translate/src/generated/resources/META-INF/services/org/apache/camel/assembler/aws2-translate-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.translate.Translate2EndpointUriAssembler
diff --git a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java
new file mode 100644
index 0000000..980147d
--- /dev/null
+++ b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.azure.eventhubs;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EventHubsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":namespace/eventHubName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "azure-eventhubs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "eventHubName", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-azure-eventhubs/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-eventhubs-endpoint b/components/camel-azure-eventhubs/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-eventhubs-endpoint
new file mode 100644
index 0000000..348c29c
--- /dev/null
+++ b/components/camel-azure-eventhubs/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-eventhubs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.azure.eventhubs.EventHubsEndpointUriAssembler
diff --git a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java
new file mode 100644
index 0000000..bc580a3
--- /dev/null
+++ b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.azure.storage.blob;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BlobEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":accountName/containerName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "azure-storage-blob".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "accountName", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "containerName", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-azure-storage-blob/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-storage-blob-endpoint b/components/camel-azure-storage-blob/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-storage-blob-endpoint
new file mode 100644
index 0000000..4d11825
--- /dev/null
+++ b/components/camel-azure-storage-blob/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-storage-blob-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.azure.storage.blob.BlobEndpointUriAssembler
diff --git a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java
new file mode 100644
index 0000000..ce0192b
--- /dev/null
+++ b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.azure.storage.queue;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class QueueEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":accountName/queueName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "azure-storage-queue".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "accountName", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-azure-storage-queue/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-storage-queue-endpoint b/components/camel-azure-storage-queue/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-storage-queue-endpoint
new file mode 100644
index 0000000..1e0f2b6
--- /dev/null
+++ b/components/camel-azure-storage-queue/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-storage-queue-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.azure.storage.queue.QueueEndpointUriAssembler
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java
new file mode 100644
index 0000000..1bfe756
--- /dev/null
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.azure.blob;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BlobServiceEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":containerOrBlobUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "azure-blob".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "containerOrBlobUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java
new file mode 100644
index 0000000..8b9f1d9
--- /dev/null
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.azure.queue;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class QueueServiceEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":containerAndQueueUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "azure-queue".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "containerAndQueueUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-blob-endpoint b/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-blob-endpoint
new file mode 100644
index 0000000..3cf0d23
--- /dev/null
+++ b/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-blob-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.azure.blob.BlobServiceEndpointUriAssembler
diff --git a/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-queue-endpoint b/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-queue-endpoint
new file mode 100644
index 0000000..b870efa
--- /dev/null
+++ b/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/assembler/azure-queue-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.azure.queue.QueueServiceEndpointUriAssembler
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java
new file mode 100644
index 0000000..376ce3b
--- /dev/null
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.bean.validator;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BeanValidatorEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "bean-validator".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-bean-validator/src/generated/resources/META-INF/services/org/apache/camel/assembler/bean-validator-endpoint b/components/camel-bean-validator/src/generated/resources/META-INF/services/org/apache/camel/assembler/bean-validator-endpoint
new file mode 100644
index 0000000..6bb38f3
--- /dev/null
+++ b/components/camel-bean-validator/src/generated/resources/META-INF/services/org/apache/camel/assembler/bean-validator-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.bean.validator.BeanValidatorEndpointUriAssembler
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java
new file mode 100644
index 0000000..07493b7
--- /dev/null
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.bean;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BeanEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":beanName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "bean".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java
new file mode 100644
index 0000000..d69025a
--- /dev/null
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.beanclass;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ClassEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":beanName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "class".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/assembler/bean-endpoint b/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/assembler/bean-endpoint
new file mode 100644
index 0000000..858cff6
--- /dev/null
+++ b/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/assembler/bean-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.bean.BeanEndpointUriAssembler
diff --git a/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/assembler/class-endpoint b/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/assembler/class-endpoint
new file mode 100644
index 0000000..01c8165
--- /dev/null
+++ b/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/assembler/class-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.beanclass.ClassEndpointUriAssembler
diff --git a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java
new file mode 100644
index 0000000..1ebd116
--- /dev/null
+++ b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.beanstalk;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BeanstalkEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":connectionSettings";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "beanstalk".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionSettings", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-beanstalk/src/generated/resources/META-INF/services/org/apache/camel/assembler/beanstalk-endpoint b/components/camel-beanstalk/src/generated/resources/META-INF/services/org/apache/camel/assembler/beanstalk-endpoint
new file mode 100644
index 0000000..c4a6174
--- /dev/null
+++ b/components/camel-beanstalk/src/generated/resources/META-INF/services/org/apache/camel/assembler/beanstalk-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.beanstalk.BeanstalkEndpointUriAssembler
diff --git a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java
new file mode 100644
index 0000000..862a91b
--- /dev/null
+++ b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.bonita;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BonitaEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":operation";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "bonita".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-bonita/src/generated/resources/META-INF/services/org/apache/camel/assembler/bonita-endpoint b/components/camel-bonita/src/generated/resources/META-INF/services/org/apache/camel/assembler/bonita-endpoint
new file mode 100644
index 0000000..630dd0c
--- /dev/null
+++ b/components/camel-bonita/src/generated/resources/META-INF/services/org/apache/camel/assembler/bonita-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.bonita.BonitaEndpointUriAssembler
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java
new file mode 100644
index 0000000..f27e746
--- /dev/null
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.box;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BoxEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":apiName/methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "box".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-box/camel-box-component/src/generated/resources/META-INF/services/org/apache/camel/assembler/box-endpoint b/components/camel-box/camel-box-component/src/generated/resources/META-INF/services/org/apache/camel/assembler/box-endpoint
new file mode 100644
index 0000000..e5031d7
--- /dev/null
+++ b/components/camel-box/camel-box-component/src/generated/resources/META-INF/services/org/apache/camel/assembler/box-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.box.BoxEndpointUriAssembler
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java
new file mode 100644
index 0000000..5b91d46
--- /dev/null
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.braintree;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BraintreeEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":apiName/methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "braintree".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-braintree/src/generated/resources/META-INF/services/org/apache/camel/assembler/braintree-endpoint b/components/camel-braintree/src/generated/resources/META-INF/services/org/apache/camel/assembler/braintree-endpoint
new file mode 100644
index 0000000..7d75a3a
--- /dev/null
+++ b/components/camel-braintree/src/generated/resources/META-INF/services/org/apache/camel/assembler/braintree-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.braintree.BraintreeEndpointUriAssembler
diff --git a/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java b/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java
new file mode 100644
index 0000000..525a3c5
--- /dev/null
+++ b/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.browse;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BrowseEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "browse".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-browse/src/generated/resources/META-INF/services/org/apache/camel/assembler/browse-endpoint b/components/camel-browse/src/generated/resources/META-INF/services/org/apache/camel/assembler/browse-endpoint
new file mode 100644
index 0000000..d58001a
--- /dev/null
+++ b/components/camel-browse/src/generated/resources/META-INF/services/org/apache/camel/assembler/browse-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.browse.BrowseEndpointUriAssembler
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java
new file mode 100644
index 0000000..0b30886
--- /dev/null
+++ b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.caffeine.cache;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CaffeineCacheEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "caffeine-cache".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java
new file mode 100644
index 0000000..07aea69
--- /dev/null
+++ b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.caffeine.load;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CaffeineLoadCacheEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "caffeine-loadcache".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/assembler/caffeine-cache-endpoint b/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/assembler/caffeine-cache-endpoint
new file mode 100644
index 0000000..58cc5e8
--- /dev/null
+++ b/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/assembler/caffeine-cache-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.caffeine.cache.CaffeineCacheEndpointUriAssembler
diff --git a/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/assembler/caffeine-loadcache-endpoint b/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/assembler/caffeine-loadcache-endpoint
new file mode 100644
index 0000000..cf86228
--- /dev/null
+++ b/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/assembler/caffeine-loadcache-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.caffeine.load.CaffeineLoadCacheEndpointUriAssembler
diff --git a/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java b/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java
new file mode 100644
index 0000000..e207539
--- /dev/null
+++ b/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cassandra;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CassandraEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":beanRef:hosts:port/keyspace";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cql".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanRef", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "hosts", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "keyspace", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cassandraql/src/generated/resources/META-INF/services/org/apache/camel/assembler/cql-endpoint b/components/camel-cassandraql/src/generated/resources/META-INF/services/org/apache/camel/assembler/cql-endpoint
new file mode 100644
index 0000000..048f4ed
--- /dev/null
+++ b/components/camel-cassandraql/src/generated/resources/META-INF/services/org/apache/camel/assembler/cql-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cassandra.CassandraEndpointUriAssembler
diff --git a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java b/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java
new file mode 100644
index 0000000..cdd7dda
--- /dev/null
+++ b/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.chatscript;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ChatScriptEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host:port/botName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "chatscript".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "1024", false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "botName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/assembler/chatscript-endpoint b/components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/assembler/chatscript-endpoint
new file mode 100644
index 0000000..4f6eab5
--- /dev/null
+++ b/components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/assembler/chatscript-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.chatscript.ChatScriptEndpointUriAssembler
diff --git a/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java b/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java
new file mode 100644
index 0000000..78ef3c7
--- /dev/null
+++ b/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.chunk;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ChunkEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "chunk".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-chunk/src/generated/resources/META-INF/services/org/apache/camel/assembler/chunk-endpoint b/components/camel-chunk/src/generated/resources/META-INF/services/org/apache/camel/assembler/chunk-endpoint
new file mode 100644
index 0000000..953cc42
--- /dev/null
+++ b/components/camel-chunk/src/generated/resources/META-INF/services/org/apache/camel/assembler/chunk-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.chunk.ChunkEndpointUriAssembler
diff --git a/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java b/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java
new file mode 100644
index 0000000..19bb474
--- /dev/null
+++ b/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cm;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CMEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cm-sms".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cm-sms/src/generated/resources/META-INF/services/org/apache/camel/assembler/cm-sms-endpoint b/components/camel-cm-sms/src/generated/resources/META-INF/services/org/apache/camel/assembler/cm-sms-endpoint
new file mode 100644
index 0000000..d5c07d1
--- /dev/null
+++ b/components/camel-cm-sms/src/generated/resources/META-INF/services/org/apache/camel/assembler/cm-sms-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cm.CMEndpointUriAssembler
diff --git a/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java b/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java
new file mode 100644
index 0000000..2cf479c
--- /dev/null
+++ b/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cmis;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CMISEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cmsUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cmis".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cmsUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cmis/src/generated/resources/META-INF/services/org/apache/camel/assembler/cmis-endpoint b/components/camel-cmis/src/generated/resources/META-INF/services/org/apache/camel/assembler/cmis-endpoint
new file mode 100644
index 0000000..3a7f2e7
--- /dev/null
+++ b/components/camel-cmis/src/generated/resources/META-INF/services/org/apache/camel/assembler/cmis-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cmis.CMISEndpointUriAssembler
diff --git a/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java b/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java
new file mode 100644
index 0000000..2f1c13f
--- /dev/null
+++ b/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java
@@ -0,0 +1,38 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.coap;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CoAPEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = "coaps+tcp:uri";
+    private static final String[] SCHEMES = new String[]{"coap", "coaps", "coap+tcp", "coaps+tcp"};
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        for (String s : SCHEMES) {
+            if (s.equals(scheme)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coap+tcp-endpoint b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coap+tcp-endpoint
new file mode 100644
index 0000000..983d52f
--- /dev/null
+++ b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coap+tcp-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.coap.CoAPEndpointUriAssembler
diff --git a/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coap-endpoint b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coap-endpoint
new file mode 100644
index 0000000..983d52f
--- /dev/null
+++ b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coap-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.coap.CoAPEndpointUriAssembler
diff --git a/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coaps+tcp-endpoint b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coaps+tcp-endpoint
new file mode 100644
index 0000000..983d52f
--- /dev/null
+++ b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coaps+tcp-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.coap.CoAPEndpointUriAssembler
diff --git a/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coaps-endpoint b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coaps-endpoint
new file mode 100644
index 0000000..983d52f
--- /dev/null
+++ b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/assembler/coaps-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.coap.CoAPEndpointUriAssembler
diff --git a/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java b/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java
new file mode 100644
index 0000000..843831b
--- /dev/null
+++ b/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java
@@ -0,0 +1,40 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cometd;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CometdEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host:port/channelName";
+    private static final String[] SCHEMES = new String[]{"cometd", "cometds"};
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        for (String s : SCHEMES) {
+            if (s.equals(scheme)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "channelName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/assembler/cometd-endpoint b/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/assembler/cometd-endpoint
new file mode 100644
index 0000000..86ac815
--- /dev/null
+++ b/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/assembler/cometd-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cometd.CometdEndpointUriAssembler
diff --git a/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/assembler/cometds-endpoint b/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/assembler/cometds-endpoint
new file mode 100644
index 0000000..86ac815
--- /dev/null
+++ b/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/assembler/cometds-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cometd.CometdEndpointUriAssembler
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java
new file mode 100644
index 0000000..f369586
--- /dev/null
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.consul;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ConsulEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":apiEndpoint";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "consul".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiEndpoint", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-consul/src/generated/resources/META-INF/services/org/apache/camel/assembler/consul-endpoint b/components/camel-consul/src/generated/resources/META-INF/services/org/apache/camel/assembler/consul-endpoint
new file mode 100644
index 0000000..b828c62
--- /dev/null
+++ b/components/camel-consul/src/generated/resources/META-INF/services/org/apache/camel/assembler/consul-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.consul.ConsulEndpointUriAssembler
diff --git a/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java b/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java
new file mode 100644
index 0000000..0fee39b
--- /dev/null
+++ b/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.controlbus;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ControlBusEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":command:language";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "controlbus".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "language", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-controlbus/src/generated/resources/META-INF/services/org/apache/camel/assembler/controlbus-endpoint b/components/camel-controlbus/src/generated/resources/META-INF/services/org/apache/camel/assembler/controlbus-endpoint
new file mode 100644
index 0000000..1f0835d
--- /dev/null
+++ b/components/camel-controlbus/src/generated/resources/META-INF/services/org/apache/camel/assembler/controlbus-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.controlbus.ControlBusEndpointUriAssembler
diff --git a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java
new file mode 100644
index 0000000..c597c16
--- /dev/null
+++ b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.corda;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CordaEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":node";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "corda".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "node", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-corda/src/generated/resources/META-INF/services/org/apache/camel/assembler/corda-endpoint b/components/camel-corda/src/generated/resources/META-INF/services/org/apache/camel/assembler/corda-endpoint
new file mode 100644
index 0000000..6a5af7a
--- /dev/null
+++ b/components/camel-corda/src/generated/resources/META-INF/services/org/apache/camel/assembler/corda-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.corda.CordaEndpointUriAssembler
diff --git a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java
new file mode 100644
index 0000000..22e39f9
--- /dev/null
+++ b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.couchbase;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CouchbaseEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":protocol:hostname:port";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "couchbase".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "8091", false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-couchbase/src/generated/resources/META-INF/services/org/apache/camel/assembler/couchbase-endpoint b/components/camel-couchbase/src/generated/resources/META-INF/services/org/apache/camel/assembler/couchbase-endpoint
new file mode 100644
index 0000000..5172542
--- /dev/null
+++ b/components/camel-couchbase/src/generated/resources/META-INF/services/org/apache/camel/assembler/couchbase-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.couchbase.CouchbaseEndpointUriAssembler
diff --git a/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java b/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java
new file mode 100644
index 0000000..aae6b78
--- /dev/null
+++ b/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.couchdb;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CouchDbEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":protocol:hostname:port/database";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "couchdb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "5984", false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-couchdb/src/generated/resources/META-INF/services/org/apache/camel/assembler/couchdb-endpoint b/components/camel-couchdb/src/generated/resources/META-INF/services/org/apache/camel/assembler/couchdb-endpoint
new file mode 100644
index 0000000..3a43728
--- /dev/null
+++ b/components/camel-couchdb/src/generated/resources/META-INF/services/org/apache/camel/assembler/couchdb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.couchdb.CouchDbEndpointUriAssembler
diff --git a/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java b/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java
new file mode 100644
index 0000000..a86bf6b
--- /dev/null
+++ b/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cron;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CronEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cron".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cron/src/generated/resources/META-INF/services/org/apache/camel/assembler/cron-endpoint b/components/camel-cron/src/generated/resources/META-INF/services/org/apache/camel/assembler/cron-endpoint
new file mode 100644
index 0000000..e71bfc7
--- /dev/null
+++ b/components/camel-cron/src/generated/resources/META-INF/services/org/apache/camel/assembler/cron-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cron.CronEndpointUriAssembler
diff --git a/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java
new file mode 100644
index 0000000..a5775b3
--- /dev/null
+++ b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.crypto.cms;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CryptoCmsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cryptoOperation:name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "crypto-cms".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cryptoOperation", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-crypto-cms/src/generated/resources/META-INF/services/org/apache/camel/assembler/crypto-cms-endpoint b/components/camel-crypto-cms/src/generated/resources/META-INF/services/org/apache/camel/assembler/crypto-cms-endpoint
new file mode 100644
index 0000000..9fd6d5c
--- /dev/null
+++ b/components/camel-crypto-cms/src/generated/resources/META-INF/services/org/apache/camel/assembler/crypto-cms-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.crypto.cms.CryptoCmsEndpointUriAssembler
diff --git a/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java
new file mode 100644
index 0000000..f9233b2
--- /dev/null
+++ b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.crypto;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DigitalSignatureEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cryptoOperation:name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "crypto".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cryptoOperation", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-crypto/src/generated/resources/META-INF/services/org/apache/camel/assembler/crypto-endpoint b/components/camel-crypto/src/generated/resources/META-INF/services/org/apache/camel/assembler/crypto-endpoint
new file mode 100644
index 0000000..f508cc1
--- /dev/null
+++ b/components/camel-crypto/src/generated/resources/META-INF/services/org/apache/camel/assembler/crypto-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.crypto.DigitalSignatureEndpointUriAssembler
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java
new file mode 100644
index 0000000..687068f
--- /dev/null
+++ b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cxf;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CxfEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":beanId:address";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cxf".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanId", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java
new file mode 100644
index 0000000..d8969ad
--- /dev/null
+++ b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cxf.jaxrs;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CxfRsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":beanId:address";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cxfrs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanId", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/assembler/cxf-endpoint b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/assembler/cxf-endpoint
new file mode 100644
index 0000000..253f217
--- /dev/null
+++ b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/assembler/cxf-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cxf.CxfEndpointUriAssembler
diff --git a/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/assembler/cxfrs-endpoint b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/assembler/cxfrs-endpoint
new file mode 100644
index 0000000..06bc8c6
--- /dev/null
+++ b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/assembler/cxfrs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cxf.jaxrs.CxfRsEndpointUriAssembler
diff --git a/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java b/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java
new file mode 100644
index 0000000..444fe8f8
--- /dev/null
+++ b/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.dataformat;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DataFormatEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name:operation";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "dataformat".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-dataformat/src/generated/resources/META-INF/services/org/apache/camel/assembler/dataformat-endpoint b/components/camel-dataformat/src/generated/resources/META-INF/services/org/apache/camel/assembler/dataformat-endpoint
new file mode 100644
index 0000000..85ec712
--- /dev/null
+++ b/components/camel-dataformat/src/generated/resources/META-INF/services/org/apache/camel/assembler/dataformat-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.dataformat.DataFormatEndpointUriAssembler
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java
new file mode 100644
index 0000000..9a91bac
--- /dev/null
+++ b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.dataset;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DataSetEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "dataset".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java
new file mode 100644
index 0000000..d5f7e25
--- /dev/null
+++ b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.dataset;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DataSetTestEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "dataset-test".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/assembler/dataset-endpoint b/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/assembler/dataset-endpoint
new file mode 100644
index 0000000..f8101b6
--- /dev/null
+++ b/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/assembler/dataset-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.dataset.DataSetEndpointUriAssembler
diff --git a/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/assembler/dataset-test-endpoint b/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/assembler/dataset-test-endpoint
new file mode 100644
index 0000000..f8a4c8b
--- /dev/null
+++ b/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/assembler/dataset-test-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.dataset.DataSetTestEndpointUriAssembler
diff --git a/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java
new file mode 100644
index 0000000..97c8bbe
--- /dev/null
+++ b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.debezium;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DebeziumMongodbEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "debezium-mongodb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-debezium-mongodb/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-mongodb-endpoint b/components/camel-debezium-mongodb/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-mongodb-endpoint
new file mode 100644
index 0000000..f76581a
--- /dev/null
+++ b/components/camel-debezium-mongodb/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-mongodb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.debezium.DebeziumMongodbEndpointUriAssembler
diff --git a/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java
new file mode 100644
index 0000000..798d8d3
--- /dev/null
+++ b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.debezium;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DebeziumMySqlEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "debezium-mysql".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-debezium-mysql/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-mysql-endpoint b/components/camel-debezium-mysql/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-mysql-endpoint
new file mode 100644
index 0000000..4d8df3e
--- /dev/null
+++ b/components/camel-debezium-mysql/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-mysql-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.debezium.DebeziumMySqlEndpointUriAssembler
diff --git a/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java
new file mode 100644
index 0000000..a5c1a5e
--- /dev/null
+++ b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.debezium;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DebeziumPostgresEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "debezium-postgres".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-debezium-postgres/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-postgres-endpoint b/components/camel-debezium-postgres/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-postgres-endpoint
new file mode 100644
index 0000000..f3c5aea
--- /dev/null
+++ b/components/camel-debezium-postgres/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-postgres-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.debezium.DebeziumPostgresEndpointUriAssembler
diff --git a/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java
new file mode 100644
index 0000000..366a070
--- /dev/null
+++ b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.debezium;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DebeziumSqlserverEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "debezium-sqlserver".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-debezium-sqlserver/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-sqlserver-endpoint b/components/camel-debezium-sqlserver/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-sqlserver-endpoint
new file mode 100644
index 0000000..a3563eb
--- /dev/null
+++ b/components/camel-debezium-sqlserver/src/generated/resources/META-INF/services/org/apache/camel/assembler/debezium-sqlserver-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.debezium.DebeziumSqlserverEndpointUriAssembler
diff --git a/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java b/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java
new file mode 100644
index 0000000..49877ae
--- /dev/null
+++ b/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.digitalocean;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DigitalOceanEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":operation";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "digitalocean".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-digitalocean/src/generated/resources/META-INF/services/org/apache/camel/assembler/digitalocean-endpoint b/components/camel-digitalocean/src/generated/resources/META-INF/services/org/apache/camel/assembler/digitalocean-endpoint
new file mode 100644
index 0000000..3aa01f1
--- /dev/null
+++ b/components/camel-digitalocean/src/generated/resources/META-INF/services/org/apache/camel/assembler/digitalocean-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.digitalocean.DigitalOceanEndpointUriAssembler
diff --git a/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java b/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java
new file mode 100644
index 0000000..25bc4e4
--- /dev/null
+++ b/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.direct;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DirectEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "direct".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-direct/src/generated/resources/META-INF/services/org/apache/camel/assembler/direct-endpoint b/components/camel-direct/src/generated/resources/META-INF/services/org/apache/camel/assembler/direct-endpoint
new file mode 100644
index 0000000..1ca7b9c
--- /dev/null
+++ b/components/camel-direct/src/generated/resources/META-INF/services/org/apache/camel/assembler/direct-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.direct.DirectEndpointUriAssembler
diff --git a/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java b/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java
new file mode 100644
index 0000000..9d47d1c
--- /dev/null
+++ b/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.directvm;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DirectVmEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "direct-vm".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-directvm/src/generated/resources/META-INF/services/org/apache/camel/assembler/direct-vm-endpoint b/components/camel-directvm/src/generated/resources/META-INF/services/org/apache/camel/assembler/direct-vm-endpoint
new file mode 100644
index 0000000..80f7cd1
--- /dev/null
+++ b/components/camel-directvm/src/generated/resources/META-INF/services/org/apache/camel/assembler/direct-vm-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.directvm.DirectVmEndpointUriAssembler
diff --git a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java
new file mode 100644
index 0000000..a1e808a
--- /dev/null
+++ b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java
@@ -0,0 +1,38 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.disruptor;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DisruptorEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+    private static final String[] SCHEMES = new String[]{"disruptor", "disruptor-vm"};
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        for (String s : SCHEMES) {
+            if (s.equals(scheme)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java
new file mode 100644
index 0000000..25cb018
--- /dev/null
+++ b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java
@@ -0,0 +1,38 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.disruptor.vm;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DisruptorVmEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+    private static final String[] SCHEMES = new String[]{"disruptor", "disruptor-vm"};
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        for (String s : SCHEMES) {
+            if (s.equals(scheme)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-disruptor/src/generated/resources/META-INF/services/org/apache/camel/assembler/disruptor-endpoint b/components/camel-disruptor/src/generated/resources/META-INF/services/org/apache/camel/assembler/disruptor-endpoint
new file mode 100644
index 0000000..a3cb931
--- /dev/null
+++ b/components/camel-disruptor/src/generated/resources/META-INF/services/org/apache/camel/assembler/disruptor-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.disruptor.vm.DisruptorVmEndpointUriAssembler
diff --git a/components/camel-disruptor/src/generated/resources/META-INF/services/org/apache/camel/assembler/disruptor-vm-endpoint b/components/camel-disruptor/src/generated/resources/META-INF/services/org/apache/camel/assembler/disruptor-vm-endpoint
new file mode 100644
index 0000000..a3cb931
--- /dev/null
+++ b/components/camel-disruptor/src/generated/resources/META-INF/services/org/apache/camel/assembler/disruptor-vm-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.disruptor.vm.DisruptorVmEndpointUriAssembler
diff --git a/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java b/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java
new file mode 100644
index 0000000..f2d7e27
--- /dev/null
+++ b/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.djl;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DJLEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":application";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "djl".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "application", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-djl/src/generated/resources/META-INF/services/org/apache/camel/assembler/djl-endpoint b/components/camel-djl/src/generated/resources/META-INF/services/org/apache/camel/assembler/djl-endpoint
new file mode 100644
index 0000000..5ece5de
--- /dev/null
+++ b/components/camel-djl/src/generated/resources/META-INF/services/org/apache/camel/assembler/djl-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.djl.DJLEndpointUriAssembler
diff --git a/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java b/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java
new file mode 100644
index 0000000..2d699a2
--- /dev/null
+++ b/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.dns;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DnsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":dnsType";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "dns".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "dnsType", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-dns/src/generated/resources/META-INF/services/org/apache/camel/assembler/dns-endpoint b/components/camel-dns/src/generated/resources/META-INF/services/org/apache/camel/assembler/dns-endpoint
new file mode 100644
index 0000000..0794850
--- /dev/null
+++ b/components/camel-dns/src/generated/resources/META-INF/services/org/apache/camel/assembler/dns-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.dns.DnsEndpointUriAssembler
diff --git a/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java b/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java
new file mode 100644
index 0000000..d91d557
--- /dev/null
+++ b/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.docker;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DockerEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":operation";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "docker".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-docker/src/generated/resources/META-INF/services/org/apache/camel/assembler/docker-endpoint b/components/camel-docker/src/generated/resources/META-INF/services/org/apache/camel/assembler/docker-endpoint
new file mode 100644
index 0000000..2d81a1b
--- /dev/null
+++ b/components/camel-docker/src/generated/resources/META-INF/services/org/apache/camel/assembler/docker-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.docker.DockerEndpointUriAssembler
diff --git a/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java b/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java
new file mode 100644
index 0000000..75d3956
--- /dev/null
+++ b/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.dozer;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DozerEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "dozer".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-dozer/src/generated/resources/META-INF/services/org/apache/camel/assembler/dozer-endpoint b/components/camel-dozer/src/generated/resources/META-INF/services/org/apache/camel/assembler/dozer-endpoint
new file mode 100644
index 0000000..8b8aaad
--- /dev/null
+++ b/components/camel-dozer/src/generated/resources/META-INF/services/org/apache/camel/assembler/dozer-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.dozer.DozerEndpointUriAssembler
diff --git a/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java b/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java
new file mode 100644
index 0000000..aa68e4a
--- /dev/null
+++ b/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.drill;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DrillEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "drill".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-drill/src/generated/resources/META-INF/services/org/apache/camel/assembler/drill-endpoint b/components/camel-drill/src/generated/resources/META-INF/services/org/apache/camel/assembler/drill-endpoint
new file mode 100644
index 0000000..d36a98f
--- /dev/null
+++ b/components/camel-drill/src/generated/resources/META-INF/services/org/apache/camel/assembler/drill-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.drill.DrillEndpointUriAssembler
diff --git a/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java b/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java
new file mode 100644
index 0000000..2ae76b6
--- /dev/null
+++ b/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.dropbox;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DropboxEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":operation";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "dropbox".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-dropbox/src/generated/resources/META-INF/services/org/apache/camel/assembler/dropbox-endpoint b/components/camel-dropbox/src/generated/resources/META-INF/services/org/apache/camel/assembler/dropbox-endpoint
new file mode 100644
index 0000000..f124b70
--- /dev/null
+++ b/components/camel-dropbox/src/generated/resources/META-INF/services/org/apache/camel/assembler/dropbox-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.dropbox.DropboxEndpointUriAssembler
diff --git a/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java b/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java
new file mode 100644
index 0000000..07fc480
--- /dev/null
+++ b/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.ehcache;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EhcacheEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "ehcache".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-ehcache/src/generated/resources/META-INF/services/org/apache/camel/assembler/ehcache-endpoint b/components/camel-ehcache/src/generated/resources/META-INF/services/org/apache/camel/assembler/ehcache-endpoint
new file mode 100644
index 0000000..c6119aa
--- /dev/null
+++ b/components/camel-ehcache/src/generated/resources/META-INF/services/org/apache/camel/assembler/ehcache-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ehcache.EhcacheEndpointUriAssembler
diff --git a/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java b/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java
new file mode 100644
index 0000000..af0552c
--- /dev/null
+++ b/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.elasticsearch;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ElasticsearchEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":clusterName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "elasticsearch-rest".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-elasticsearch-rest/src/generated/resources/META-INF/services/org/apache/camel/assembler/elasticsearch-rest-endpoint b/components/camel-elasticsearch-rest/src/generated/resources/META-INF/services/org/apache/camel/assembler/elasticsearch-rest-endpoint
new file mode 100644
index 0000000..1444f4f
--- /dev/null
+++ b/components/camel-elasticsearch-rest/src/generated/resources/META-INF/services/org/apache/camel/assembler/elasticsearch-rest-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.elasticsearch.ElasticsearchEndpointUriAssembler
diff --git a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java
new file mode 100644
index 0000000..cd6727b
--- /dev/null
+++ b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.elsql;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ElsqlEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":elsqlName:resourceUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "elsql".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "elsqlName", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-elsql/src/generated/resources/META-INF/services/org/apache/camel/assembler/elsql-endpoint b/components/camel-elsql/src/generated/resources/META-INF/services/org/apache/camel/assembler/elsql-endpoint
new file mode 100644
index 0000000..4c9d4b2
--- /dev/null
+++ b/components/camel-elsql/src/generated/resources/META-INF/services/org/apache/camel/assembler/elsql-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.elsql.ElsqlEndpointUriAssembler
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java
new file mode 100644
index 0000000..8e8697e
--- /dev/null
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.etcd;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EtcdKeysEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":path";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "etcd-keys".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java
new file mode 100644
index 0000000..c608a0d
--- /dev/null
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.etcd;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EtcdStatsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":path";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "etcd-stats".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java
new file mode 100644
index 0000000..72db4d41
--- /dev/null
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.etcd;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EtcdWatchEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":path";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "etcd-watch".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-etcd/src/generated/resources/META-INF/services/org/apache/camel/assembler/etcd-keys-endpoint b/components/camel-etcd/src/generated/resources/META-INF/services/org/apache/camel/assembler/etcd-keys-endpoint
new file mode 100644
index 0000000..5492f12
--- /dev/null
+++ b/components/camel-etcd/src/generated/resources/META-INF/services/org/apache/camel/assembler/etcd-keys-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.etcd.EtcdKeysEndpointUriAssembler
diff --git a/components/camel-etcd/src/generated/resources/META-INF/services/org/apache/camel/assembler/etcd-stats-endpoint b/components/camel-etcd/src/generated/resources/META-INF/services/org/apache/camel/assembler/etcd-stats-endpoint
new file mode 100644
index 0000000..1701cf9
--- /dev/null
+++ b/components/camel-etcd/src/generated/resources/META-INF/services/org/apache/camel/assembler/etcd-stats-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.etcd.EtcdStatsEndpointUriAssembler
diff --git a/components/camel-etcd/src/generated/resources/META-INF/services/org/apache/camel/assembler/etcd-watch-endpoint b/components/camel-etcd/src/generated/resources/META-INF/services/org/apache/camel/assembler/etcd-watch-endpoint
new file mode 100644
index 0000000..92bf37a
--- /dev/null
+++ b/components/camel-etcd/src/generated/resources/META-INF/services/org/apache/camel/assembler/etcd-watch-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.etcd.EtcdWatchEndpointUriAssembler
diff --git a/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java b/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java
new file mode 100644
index 0000000..9f0c3c1
--- /dev/null
+++ b/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.exec;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ExecEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":executable";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "exec".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "executable", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-exec/src/generated/resources/META-INF/services/org/apache/camel/assembler/exec-endpoint b/components/camel-exec/src/generated/resources/META-INF/services/org/apache/camel/assembler/exec-endpoint
new file mode 100644
index 0000000..3f4f280
--- /dev/null
+++ b/components/camel-exec/src/generated/resources/META-INF/services/org/apache/camel/assembler/exec-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.exec.ExecEndpointUriAssembler
diff --git a/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java b/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java
new file mode 100644
index 0000000..d90a523
--- /dev/null
+++ b/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.facebook;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class FacebookEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "facebook".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-facebook/src/generated/resources/META-INF/services/org/apache/camel/assembler/facebook-endpoint b/components/camel-facebook/src/generated/resources/META-INF/services/org/apache/camel/assembler/facebook-endpoint
new file mode 100644
index 0000000..cec33cb
--- /dev/null
+++ b/components/camel-facebook/src/generated/resources/META-INF/services/org/apache/camel/assembler/facebook-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.facebook.FacebookEndpointUriAssembler
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java
new file mode 100644
index 0000000..0d2c02a
--- /dev/null
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.fhir;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class FhirEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":apiName/methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "fhir".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/resources/META-INF/services/org/apache/camel/assembler/fhir-endpoint b/components/camel-fhir/camel-fhir-component/src/generated/resources/META-INF/services/org/apache/camel/assembler/fhir-endpoint
new file mode 100644
index 0000000..58abfff
--- /dev/null
+++ b/components/camel-fhir/camel-fhir-component/src/generated/resources/META-INF/services/org/apache/camel/assembler/fhir-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.fhir.FhirEndpointUriAssembler
diff --git a/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java b/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java
new file mode 100644
index 0000000..8128688
--- /dev/null
+++ b/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.file.watch;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class FileWatchEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":path";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "file-watch".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-file-watch/src/generated/resources/META-INF/services/org/apache/camel/assembler/file-watch-endpoint b/components/camel-file-watch/src/generated/resources/META-INF/services/org/apache/camel/assembler/file-watch-endpoint
new file mode 100644
index 0000000..2f318ca
--- /dev/null
+++ b/components/camel-file-watch/src/generated/resources/META-INF/services/org/apache/camel/assembler/file-watch-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.file.watch.FileWatchEndpointUriAssembler
diff --git a/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java b/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java
new file mode 100644
index 0000000..f86947b
--- /dev/null
+++ b/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.file;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class FileEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":directoryName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "file".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-file/src/generated/resources/META-INF/services/org/apache/camel/assembler/file-endpoint b/components/camel-file/src/generated/resources/META-INF/services/org/apache/camel/assembler/file-endpoint
new file mode 100644
index 0000000..bba8e4c
--- /dev/null
+++ b/components/camel-file/src/generated/resources/META-INF/services/org/apache/camel/assembler/file-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.file.FileEndpointUriAssembler
diff --git a/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java
new file mode 100644
index 0000000..76e88e3
--- /dev/null
+++ b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.flatpack;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class FlatpackEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":type:resourceUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "flatpack".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", "delim", false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-flatpack/src/generated/resources/META-INF/services/org/apache/camel/assembler/flatpack-endpoint b/components/camel-flatpack/src/generated/resources/META-INF/services/org/apache/camel/assembler/flatpack-endpoint
new file mode 100644
index 0000000..df21d40
--- /dev/null
+++ b/components/camel-flatpack/src/generated/resources/META-INF/services/org/apache/camel/assembler/flatpack-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.flatpack.FlatpackEndpointUriAssembler
diff --git a/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java b/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java
new file mode 100644
index 0000000..a7aea31
--- /dev/null
+++ b/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.flink;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class FlinkEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":endpointType";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "flink".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "endpointType", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-flink/src/generated/resources/META-INF/services/org/apache/camel/assembler/flink-endpoint b/components/camel-flink/src/generated/resources/META-INF/services/org/apache/camel/assembler/flink-endpoint
new file mode 100644
index 0000000..82df675
--- /dev/null
+++ b/components/camel-flink/src/generated/resources/META-INF/services/org/apache/camel/assembler/flink-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.flink.FlinkEndpointUriAssembler
diff --git a/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java b/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java
new file mode 100644
index 0000000..114f4e7
--- /dev/null
+++ b/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.fop;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class FopEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":outputType";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "fop".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "outputType", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-fop/src/generated/resources/META-INF/services/org/apache/camel/assembler/fop-endpoint b/components/camel-fop/src/generated/resources/META-INF/services/org/apache/camel/assembler/fop-endpoint
new file mode 100644
index 0000000..c2746db
--- /dev/null
+++ b/components/camel-fop/src/generated/resources/META-INF/services/org/apache/camel/assembler/fop-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.fop.FopEndpointUriAssembler
diff --git a/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java b/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java
new file mode 100644
index 0000000..7ef5488
--- /dev/null
+++ b/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.freemarker;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class FreemarkerEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "freemarker".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-freemarker/src/generated/resources/META-INF/services/org/apache/camel/assembler/freemarker-endpoint b/components/camel-freemarker/src/generated/resources/META-INF/services/org/apache/camel/assembler/freemarker-endpoint
new file mode 100644
index 0000000..e44d9ea
--- /dev/null
+++ b/components/camel-freemarker/src/generated/resources/META-INF/services/org/apache/camel/assembler/freemarker-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.freemarker.FreemarkerEndpointUriAssembler
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java
new file mode 100644
index 0000000..f36fbb6
--- /dev/null
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.file.remote;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class FtpEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host:port/directoryName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "ftp".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java
new file mode 100644
index 0000000..12b0181
--- /dev/null
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.file.remote;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class FtpsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host:port/directoryName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "ftps".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java
new file mode 100644
index 0000000..3671d0e
--- /dev/null
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.file.remote;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class SftpEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host:port/directoryName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "sftp".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/assembler/ftp-endpoint b/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/assembler/ftp-endpoint
new file mode 100644
index 0000000..3226ddf
--- /dev/null
+++ b/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/assembler/ftp-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.file.remote.FtpEndpointUriAssembler
diff --git a/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/assembler/ftps-endpoint b/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/assembler/ftps-endpoint
new file mode 100644
index 0000000..3bbfa40
--- /dev/null
+++ b/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/assembler/ftps-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.file.remote.FtpsEndpointUriAssembler
diff --git a/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/assembler/sftp-endpoint b/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/assembler/sftp-endpoint
new file mode 100644
index 0000000..6fa8cc0
--- /dev/null
+++ b/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/assembler/sftp-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.file.remote.SftpEndpointUriAssembler
diff --git a/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java b/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java
new file mode 100644
index 0000000..523c01a
--- /dev/null
+++ b/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.ganglia;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GangliaEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host:port";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "ganglia".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", "239.2.11.71", false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "8649", false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-ganglia/src/generated/resources/META-INF/services/org/apache/camel/assembler/ganglia-endpoint b/components/camel-ganglia/src/generated/resources/META-INF/services/org/apache/camel/assembler/ganglia-endpoint
new file mode 100644
index 0000000..934f186
--- /dev/null
+++ b/components/camel-ganglia/src/generated/resources/META-INF/services/org/apache/camel/assembler/ganglia-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ganglia.GangliaEndpointUriAssembler
diff --git a/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java b/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java
new file mode 100644
index 0000000..f8bdfd6
--- /dev/null
+++ b/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.geocoder;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GeoCoderEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":address:latlng";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "geocoder".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "latlng", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-geocoder/src/generated/resources/META-INF/services/org/apache/camel/assembler/geocoder-endpoint b/components/camel-geocoder/src/generated/resources/META-INF/services/org/apache/camel/assembler/geocoder-endpoint
new file mode 100644
index 0000000..d4c4e80
--- /dev/null
+++ b/components/camel-geocoder/src/generated/resources/META-INF/services/org/apache/camel/assembler/geocoder-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.geocoder.GeoCoderEndpointUriAssembler
diff --git a/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java b/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java
new file mode 100644
index 0000000..643c7b0
--- /dev/null
+++ b/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.git;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GitEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":localPath";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "git".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "localPath", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-git/src/generated/resources/META-INF/services/org/apache/camel/assembler/git-endpoint b/components/camel-git/src/generated/resources/META-INF/services/org/apache/camel/assembler/git-endpoint
new file mode 100644
index 0000000..9ecc960
--- /dev/null
+++ b/components/camel-git/src/generated/resources/META-INF/services/org/apache/camel/assembler/git-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.git.GitEndpointUriAssembler
diff --git a/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java b/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java
new file mode 100644
index 0000000..fc1e7d3
--- /dev/null
+++ b/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.github;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GitHubEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":type/branchName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "github".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "branchName", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-github/src/generated/resources/META-INF/services/org/apache/camel/assembler/github-endpoint b/components/camel-github/src/generated/resources/META-INF/services/org/apache/camel/assembler/github-endpoint
new file mode 100644
index 0000000..b6e2471
--- /dev/null
+++ b/components/camel-github/src/generated/resources/META-INF/services/org/apache/camel/assembler/github-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.github.GitHubEndpointUriAssembler
diff --git a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java
new file mode 100644
index 0000000..e8642ea
--- /dev/null
+++ b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.google.bigquery;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GoogleBigQueryEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":projectId:datasetId:tableId";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "google-bigquery".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "datasetId", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "tableId", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java
new file mode 100644
index 0000000..be65f37
--- /dev/null
+++ b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.google.bigquery.sql;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GoogleBigQuerySQLEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":projectId:query";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "google-bigquery-sql".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "query", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-google-bigquery/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-bigquery-endpoint b/components/camel-google-bigquery/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-bigquery-endpoint
new file mode 100644
index 0000000..069dceb
--- /dev/null
+++ b/components/camel-google-bigquery/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-bigquery-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.bigquery.GoogleBigQueryEndpointUriAssembler
diff --git a/components/camel-google-bigquery/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-bigquery-sql-endpoint b/components/camel-google-bigquery/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-bigquery-sql-endpoint
new file mode 100644
index 0000000..aa9abb8
--- /dev/null
+++ b/components/camel-google-bigquery/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-bigquery-sql-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLEndpointUriAssembler
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java
new file mode 100644
index 0000000..5f7ce70
--- /dev/null
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.google.calendar;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GoogleCalendarEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":apiName/methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "google-calendar".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java
new file mode 100644
index 0000000..afe0a35
--- /dev/null
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.google.calendar.stream;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GoogleCalendarStreamEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":index";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "google-calendar-stream".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-google-calendar/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-calendar-endpoint b/components/camel-google-calendar/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-calendar-endpoint
new file mode 100644
index 0000000..2a884f4
--- /dev/null
+++ b/components/camel-google-calendar/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-calendar-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.calendar.GoogleCalendarEndpointUriAssembler
diff --git a/components/camel-google-calendar/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-calendar-stream-endpoint b/components/camel-google-calendar/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-calendar-stream-endpoint
new file mode 100644
index 0000000..b9aa747
--- /dev/null
+++ b/components/camel-google-calendar/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-calendar-stream-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamEndpointUriAssembler
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java
new file mode 100644
index 0000000..0bae34b
--- /dev/null
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.google.drive;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GoogleDriveEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":apiName/methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "google-drive".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-google-drive/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-drive-endpoint b/components/camel-google-drive/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-drive-endpoint
new file mode 100644
index 0000000..c3ae96d
--- /dev/null
+++ b/components/camel-google-drive/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-drive-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.drive.GoogleDriveEndpointUriAssembler
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java
new file mode 100644
index 0000000..91fe071
--- /dev/null
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.google.mail;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GoogleMailEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":apiName/methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "google-mail".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java
new file mode 100644
index 0000000..2bb8b47
--- /dev/null
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.google.mail.stream;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GoogleMailStreamEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":index";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "google-mail-stream".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-google-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-mail-endpoint b/components/camel-google-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-mail-endpoint
new file mode 100644
index 0000000..a0cb06b
--- /dev/null
+++ b/components/camel-google-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-mail-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.mail.GoogleMailEndpointUriAssembler
diff --git a/components/camel-google-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-mail-stream-endpoint b/components/camel-google-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-mail-stream-endpoint
new file mode 100644
index 0000000..76016fe
--- /dev/null
+++ b/components/camel-google-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-mail-stream-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.mail.stream.GoogleMailStreamEndpointUriAssembler
diff --git a/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java b/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java
new file mode 100644
index 0000000..ae9ed31
--- /dev/null
+++ b/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.google.pubsub;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GooglePubsubEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":projectId:destinationName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "google-pubsub".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-pubsub-endpoint b/components/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-pubsub-endpoint
new file mode 100644
index 0000000..878ed51
--- /dev/null
+++ b/components/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-pubsub-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.pubsub.GooglePubsubEndpointUriAssembler
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java
new file mode 100644
index 0000000..9faaf18
--- /dev/null
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.google.sheets;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GoogleSheetsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":apiName/methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "google-sheets".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java
new file mode 100644
index 0000000..885531b
--- /dev/null
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.google.sheets.stream;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GoogleSheetsStreamEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":apiName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "google-sheets-stream".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-sheets-endpoint b/components/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-sheets-endpoint
new file mode 100644
index 0000000..bd03a39
--- /dev/null
+++ b/components/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-sheets-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.sheets.GoogleSheetsEndpointUriAssembler
diff --git a/components/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-sheets-stream-endpoint b/components/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-sheets-stream-endpoint
new file mode 100644
index 0000000..b14b387
--- /dev/null
+++ b/components/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/assembler/google-sheets-stream-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamEndpointUriAssembler
diff --git a/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java b/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java
new file mode 100644
index 0000000..a9a676a
--- /dev/null
+++ b/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.gora;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GoraEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "gora".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-gora/src/generated/resources/META-INF/services/org/apache/camel/assembler/gora-endpoint b/components/camel-gora/src/generated/resources/META-INF/services/org/apache/camel/assembler/gora-endpoint
new file mode 100644
index 0000000..5749c59
--- /dev/null
+++ b/components/camel-gora/src/generated/resources/META-INF/services/org/apache/camel/assembler/gora-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.gora.GoraEndpointUriAssembler
diff --git a/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java b/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java
new file mode 100644
index 0000000..5fd0d3d
--- /dev/null
+++ b/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.grape;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GrapeEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":defaultCoordinates";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "grape".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "defaultCoordinates", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-grape/src/generated/resources/META-INF/services/org/apache/camel/assembler/grape-endpoint b/components/camel-grape/src/generated/resources/META-INF/services/org/apache/camel/assembler/grape-endpoint
new file mode 100644
index 0000000..e26aae5
--- /dev/null
+++ b/components/camel-grape/src/generated/resources/META-INF/services/org/apache/camel/assembler/grape-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.grape.GrapeEndpointUriAssembler
diff --git a/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java b/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java
new file mode 100644
index 0000000..fefacb5
--- /dev/null
+++ b/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.graphql;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GraphqlEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":httpUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "graphql".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-graphql/src/generated/resources/META-INF/services/org/apache/camel/assembler/graphql-endpoint b/components/camel-graphql/src/generated/resources/META-INF/services/org/apache/camel/assembler/graphql-endpoint
new file mode 100644
index 0000000..bd54b35
--- /dev/null
+++ b/components/camel-graphql/src/generated/resources/META-INF/services/org/apache/camel/assembler/graphql-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.graphql.GraphqlEndpointUriAssembler
diff --git a/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java b/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java
new file mode 100644
index 0000000..cabf7a9
--- /dev/null
+++ b/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.grpc;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GrpcEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host:port/service";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "grpc".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "service", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-grpc/src/generated/resources/META-INF/services/org/apache/camel/assembler/grpc-endpoint b/components/camel-grpc/src/generated/resources/META-INF/services/org/apache/camel/assembler/grpc-endpoint
new file mode 100644
index 0000000..56d8ce3
--- /dev/null
+++ b/components/camel-grpc/src/generated/resources/META-INF/services/org/apache/camel/assembler/grpc-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.grpc.GrpcEndpointUriAssembler
diff --git a/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java b/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java
new file mode 100644
index 0000000..a1b704c
--- /dev/null
+++ b/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.guava.eventbus;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class GuavaEventBusEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":eventBusRef";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "guava-eventbus".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "eventBusRef", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-guava-eventbus/src/generated/resources/META-INF/services/org/apache/camel/assembler/guava-eventbus-endpoint b/components/camel-guava-eventbus/src/generated/resources/META-INF/services/org/apache/camel/assembler/guava-eventbus-endpoint
new file mode 100644
index 0000000..70064bf
--- /dev/null
+++ b/components/camel-guava-eventbus/src/generated/resources/META-INF/services/org/apache/camel/assembler/guava-eventbus-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.guava.eventbus.GuavaEventBusEndpointUriAssembler
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java
new file mode 100644
index 0000000..57950fb
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hazelcast.atomicnumber;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HazelcastAtomicnumberEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hazelcast-atomicvalue".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java
new file mode 100644
index 0000000..4c36b55
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hazelcast.instance;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HazelcastInstanceEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hazelcast-instance".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java
new file mode 100644
index 0000000..d31448d
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hazelcast.list;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HazelcastListEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hazelcast-list".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java
new file mode 100644
index 0000000..65e2e2d
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hazelcast.map;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HazelcastMapEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hazelcast-map".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java
new file mode 100644
index 0000000..2279e6a
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hazelcast.multimap;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HazelcastMultimapEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hazelcast-multimap".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java
new file mode 100644
index 0000000..56205a9
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hazelcast.queue;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HazelcastQueueEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hazelcast-queue".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java
new file mode 100644
index 0000000..0378177
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hazelcast.replicatedmap;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HazelcastReplicatedmapEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hazelcast-replicatedmap".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java
new file mode 100644
index 0000000..09c5305
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hazelcast.ringbuffer;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HazelcastRingbufferEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hazelcast-ringbuffer".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java
new file mode 100644
index 0000000..6993d08
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hazelcast.seda;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HazelcastSedaEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hazelcast-seda".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java
new file mode 100644
index 0000000..78eb02c
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hazelcast.set;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HazelcastSetEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hazelcast-set".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java
new file mode 100644
index 0000000..f50726d
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hazelcast.topic;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HazelcastTopicEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hazelcast-topic".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-atomicvalue-endpoint b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-atomicvalue-endpoint
new file mode 100644
index 0000000..a19e0a0
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-atomicvalue-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hazelcast.atomicnumber.HazelcastAtomicnumberEndpointUriAssembler
diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-instance-endpoint b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-instance-endpoint
new file mode 100644
index 0000000..c996ab7
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-instance-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hazelcast.instance.HazelcastInstanceEndpointUriAssembler
diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-list-endpoint b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-list-endpoint
new file mode 100644
index 0000000..2c83172
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-list-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hazelcast.list.HazelcastListEndpointUriAssembler
diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-map-endpoint b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-map-endpoint
new file mode 100644
index 0000000..c5dbbc2
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-map-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hazelcast.map.HazelcastMapEndpointUriAssembler
diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-multimap-endpoint b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-multimap-endpoint
new file mode 100644
index 0000000..f3a8ece
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-multimap-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hazelcast.multimap.HazelcastMultimapEndpointUriAssembler
diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-queue-endpoint b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-queue-endpoint
new file mode 100644
index 0000000..e32e709
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-queue-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hazelcast.queue.HazelcastQueueEndpointUriAssembler
diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-replicatedmap-endpoint b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-replicatedmap-endpoint
new file mode 100644
index 0000000..bafe453
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-replicatedmap-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hazelcast.replicatedmap.HazelcastReplicatedmapEndpointUriAssembler
diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-ringbuffer-endpoint b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-ringbuffer-endpoint
new file mode 100644
index 0000000..aa18ea8
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-ringbuffer-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hazelcast.ringbuffer.HazelcastRingbufferEndpointUriAssembler
diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-seda-endpoint b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-seda-endpoint
new file mode 100644
index 0000000..bcce634
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-seda-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hazelcast.seda.HazelcastSedaEndpointUriAssembler
diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-set-endpoint b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-set-endpoint
new file mode 100644
index 0000000..33c34cd
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-set-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hazelcast.set.HazelcastSetEndpointUriAssembler
diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-topic-endpoint b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-topic-endpoint
new file mode 100644
index 0000000..0e03917
--- /dev/null
+++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/assembler/hazelcast-topic-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hazelcast.topic.HazelcastTopicEndpointUriAssembler
diff --git a/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java b/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java
new file mode 100644
index 0000000..a03b0bf
--- /dev/null
+++ b/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hbase;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HBaseEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":tableName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hbase".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hbase/src/generated/resources/META-INF/services/org/apache/camel/assembler/hbase-endpoint b/components/camel-hbase/src/generated/resources/META-INF/services/org/apache/camel/assembler/hbase-endpoint
new file mode 100644
index 0000000..8b5896c
--- /dev/null
+++ b/components/camel-hbase/src/generated/resources/META-INF/services/org/apache/camel/assembler/hbase-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hbase.HBaseEndpointUriAssembler
diff --git a/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java b/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java
new file mode 100644
index 0000000..aad5e54
--- /dev/null
+++ b/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hdfs;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HdfsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":hostName:port/path";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hdfs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "hostName", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "8020", false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hdfs/src/generated/resources/META-INF/services/org/apache/camel/assembler/hdfs-endpoint b/components/camel-hdfs/src/generated/resources/META-INF/services/org/apache/camel/assembler/hdfs-endpoint
new file mode 100644
index 0000000..451656c
--- /dev/null
+++ b/components/camel-hdfs/src/generated/resources/META-INF/services/org/apache/camel/assembler/hdfs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hdfs.HdfsEndpointUriAssembler
diff --git a/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java b/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java
new file mode 100644
index 0000000..f6e1d02
--- /dev/null
+++ b/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.hipchat;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HipchatEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":protocol:host:port";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "hipchat".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "80", false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-hipchat/src/generated/resources/META-INF/services/org/apache/camel/assembler/hipchat-endpoint b/components/camel-hipchat/src/generated/resources/META-INF/services/org/apache/camel/assembler/hipchat-endpoint
new file mode 100644
index 0000000..ede5d3e
--- /dev/null
+++ b/components/camel-hipchat/src/generated/resources/META-INF/services/org/apache/camel/assembler/hipchat-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.hipchat.HipchatEndpointUriAssembler
diff --git a/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java
new file mode 100644
index 0000000..07552d1
--- /dev/null
+++ b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java
@@ -0,0 +1,38 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.http;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class HttpEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":httpUri";
+    private static final String[] SCHEMES = new String[]{"http", "https"};
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        for (String s : SCHEMES) {
+            if (s.equals(scheme)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-http/src/generated/resources/META-INF/services/org/apache/camel/assembler/http-endpoint b/components/camel-http/src/generated/resources/META-INF/services/org/apache/camel/assembler/http-endpoint
new file mode 100644
index 0000000..d3e07ad
--- /dev/null
+++ b/components/camel-http/src/generated/resources/META-INF/services/org/apache/camel/assembler/http-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.http.HttpEndpointUriAssembler
diff --git a/components/camel-http/src/generated/resources/META-INF/services/org/apache/camel/assembler/https-endpoint b/components/camel-http/src/generated/resources/META-INF/services/org/apache/camel/assembler/https-endpoint
new file mode 100644
index 0000000..d3e07ad
--- /dev/null
+++ b/components/camel-http/src/generated/resources/META-INF/services/org/apache/camel/assembler/https-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.http.HttpEndpointUriAssembler
diff --git a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java
new file mode 100644
index 0000000..5d4dcba
--- /dev/null
+++ b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.iec60870.client;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ClientEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":uriPath";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "iec60870-client".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java
new file mode 100644
index 0000000..bd58a52
--- /dev/null
+++ b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.iec60870.server;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ServerEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":uriPath";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "iec60870-server".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-iec60870/src/generated/resources/META-INF/services/org/apache/camel/assembler/iec60870-client-endpoint b/components/camel-iec60870/src/generated/resources/META-INF/services/org/apache/camel/assembler/iec60870-client-endpoint
new file mode 100644
index 0000000..226c792
--- /dev/null
+++ b/components/camel-iec60870/src/generated/resources/META-INF/services/org/apache/camel/assembler/iec60870-client-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.iec60870.client.ClientEndpointUriAssembler
diff --git a/components/camel-iec60870/src/generated/resources/META-INF/services/org/apache/camel/assembler/iec60870-server-endpoint b/components/camel-iec60870/src/generated/resources/META-INF/services/org/apache/camel/assembler/iec60870-server-endpoint
new file mode 100644
index 0000000..a713bfc
--- /dev/null
+++ b/components/camel-iec60870/src/generated/resources/META-INF/services/org/apache/camel/assembler/iec60870-server-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.iec60870.server.ServerEndpointUriAssembler
diff --git a/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-cache-endpoint b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-cache-endpoint
new file mode 100644
index 0000000..ffc767c
--- /dev/null
+++ b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-cache-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ignite.cache.IgniteCacheEndpointUriAssembler
diff --git a/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-compute-endpoint b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-compute-endpoint
new file mode 100644
index 0000000..ca5b1ee
--- /dev/null
+++ b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-compute-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ignite.compute.IgniteComputeEndpointUriAssembler
diff --git a/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-events-endpoint b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-events-endpoint
new file mode 100644
index 0000000..af519ce
--- /dev/null
+++ b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-events-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ignite.events.IgniteEventsEndpointUriAssembler
diff --git a/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-idgen-endpoint b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-idgen-endpoint
new file mode 100644
index 0000000..bc0763b
--- /dev/null
+++ b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-idgen-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ignite.idgen.IgniteIdGenEndpointUriAssembler
diff --git a/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-messaging-endpoint b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-messaging-endpoint
new file mode 100644
index 0000000..0a8bf28
--- /dev/null
+++ b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-messaging-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ignite.messaging.IgniteMessagingEndpointUriAssembler
diff --git a/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-queue-endpoint b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-queue-endpoint
new file mode 100644
index 0000000..2fab94b
--- /dev/null
+++ b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-queue-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ignite.queue.IgniteQueueEndpointUriAssembler
diff --git a/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-set-endpoint b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-set-endpoint
new file mode 100644
index 0000000..474222c
--- /dev/null
+++ b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/assembler/ignite-set-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ignite.set.IgniteSetEndpointUriAssembler
diff --git a/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java b/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java
new file mode 100644
index 0000000..f2d4882
--- /dev/null
+++ b/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.infinispan;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class InfinispanEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "infinispan".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-infinispan/src/generated/resources/META-INF/services/org/apache/camel/assembler/infinispan-endpoint b/components/camel-infinispan/src/generated/resources/META-INF/services/org/apache/camel/assembler/infinispan-endpoint
new file mode 100644
index 0000000..42e5393
--- /dev/null
+++ b/components/camel-infinispan/src/generated/resources/META-INF/services/org/apache/camel/assembler/infinispan-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.infinispan.InfinispanEndpointUriAssembler
diff --git a/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java b/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java
new file mode 100644
index 0000000..e7a1106
--- /dev/null
+++ b/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.influxdb;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class InfluxDbEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":connectionBean";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "influxdb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-influxdb/src/generated/resources/META-INF/services/org/apache/camel/assembler/influxdb-endpoint b/components/camel-influxdb/src/generated/resources/META-INF/services/org/apache/camel/assembler/influxdb-endpoint
new file mode 100644
index 0000000..938f10e
--- /dev/null
+++ b/components/camel-influxdb/src/generated/resources/META-INF/services/org/apache/camel/assembler/influxdb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.influxdb.InfluxDbEndpointUriAssembler
diff --git a/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java b/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java
new file mode 100644
index 0000000..07455ae
--- /dev/null
+++ b/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.iota;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class IOTAEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "iota".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-iota/src/generated/resources/META-INF/services/org/apache/camel/assembler/iota-endpoint b/components/camel-iota/src/generated/resources/META-INF/services/org/apache/camel/assembler/iota-endpoint
new file mode 100644
index 0000000..12fa4de
--- /dev/null
+++ b/components/camel-iota/src/generated/resources/META-INF/services/org/apache/camel/assembler/iota-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.iota.IOTAEndpointUriAssembler
diff --git a/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java b/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java
new file mode 100644
index 0000000..d6088b1
--- /dev/null
+++ b/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.ipfs;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class IPFSEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":ipfsCmd";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "ipfs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "ipfsCmd", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-ipfs/src/generated/resources/META-INF/services/org/apache/camel/assembler/ipfs-endpoint b/components/camel-ipfs/src/generated/resources/META-INF/services/org/apache/camel/assembler/ipfs-endpoint
new file mode 100644
index 0000000..8b9cf1c
--- /dev/null
+++ b/components/camel-ipfs/src/generated/resources/META-INF/services/org/apache/camel/assembler/ipfs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ipfs.IPFSEndpointUriAssembler
diff --git a/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java b/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java
new file mode 100644
index 0000000..bba7989
--- /dev/null
+++ b/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.irc;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class IrcEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":hostname:port";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "irc".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-irc/src/generated/resources/META-INF/services/org/apache/camel/assembler/irc-endpoint b/components/camel-irc/src/generated/resources/META-INF/services/org/apache/camel/assembler/irc-endpoint
new file mode 100644
index 0000000..7910e20
--- /dev/null
+++ b/components/camel-irc/src/generated/resources/META-INF/services/org/apache/camel/assembler/irc-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.irc.IrcEndpointUriAssembler
diff --git a/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java b/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java
new file mode 100644
index 0000000..6b2f826
--- /dev/null
+++ b/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.ironmq;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class IronMQEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":queueName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "ironmq".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-ironmq/src/generated/resources/META-INF/services/org/apache/camel/assembler/ironmq-endpoint b/components/camel-ironmq/src/generated/resources/META-INF/services/org/apache/camel/assembler/ironmq-endpoint
new file mode 100644
index 0000000..25918a7
--- /dev/null
+++ b/components/camel-ironmq/src/generated/resources/META-INF/services/org/apache/camel/assembler/ironmq-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ironmq.IronMQEndpointUriAssembler
diff --git a/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java b/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java
new file mode 100644
index 0000000..b175b91
--- /dev/null
+++ b/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jbpm;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JBPMEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":connectionURL";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jbpm".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionURL", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "eventListenerType", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jbpm/src/generated/resources/META-INF/services/org/apache/camel/assembler/jbpm-endpoint b/components/camel-jbpm/src/generated/resources/META-INF/services/org/apache/camel/assembler/jbpm-endpoint
new file mode 100644
index 0000000..fe4780b
--- /dev/null
+++ b/components/camel-jbpm/src/generated/resources/META-INF/services/org/apache/camel/assembler/jbpm-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jbpm.JBPMEndpointUriAssembler
diff --git a/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java b/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java
new file mode 100644
index 0000000..f2cca26
--- /dev/null
+++ b/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jcache;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JCacheEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jcache".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jcache/src/generated/resources/META-INF/services/org/apache/camel/assembler/jcache-endpoint b/components/camel-jcache/src/generated/resources/META-INF/services/org/apache/camel/assembler/jcache-endpoint
new file mode 100644
index 0000000..e550b3a
--- /dev/null
+++ b/components/camel-jcache/src/generated/resources/META-INF/services/org/apache/camel/assembler/jcache-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jcache.JCacheEndpointUriAssembler
diff --git a/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java b/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java
new file mode 100644
index 0000000..e97c6c8
--- /dev/null
+++ b/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jclouds;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JcloudsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":command:providerId";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jclouds".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "providerId", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jclouds/src/generated/resources/META-INF/services/org/apache/camel/assembler/jclouds-endpoint b/components/camel-jclouds/src/generated/resources/META-INF/services/org/apache/camel/assembler/jclouds-endpoint
new file mode 100644
index 0000000..d26f9f3
--- /dev/null
+++ b/components/camel-jclouds/src/generated/resources/META-INF/services/org/apache/camel/assembler/jclouds-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jclouds.JcloudsEndpointUriAssembler
diff --git a/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java b/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java
new file mode 100644
index 0000000..a283771
--- /dev/null
+++ b/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jcr;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JcrEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host/base";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jcr".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "base", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jcr/src/generated/resources/META-INF/services/org/apache/camel/assembler/jcr-endpoint b/components/camel-jcr/src/generated/resources/META-INF/services/org/apache/camel/assembler/jcr-endpoint
new file mode 100644
index 0000000..7df9f31
--- /dev/null
+++ b/components/camel-jcr/src/generated/resources/META-INF/services/org/apache/camel/assembler/jcr-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jcr.JcrEndpointUriAssembler
diff --git a/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java b/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java
new file mode 100644
index 0000000..ca489c8
--- /dev/null
+++ b/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jdbc;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JdbcEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":dataSourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jdbc".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "dataSourceName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jdbc/src/generated/resources/META-INF/services/org/apache/camel/assembler/jdbc-endpoint b/components/camel-jdbc/src/generated/resources/META-INF/services/org/apache/camel/assembler/jdbc-endpoint
new file mode 100644
index 0000000..110bf06
--- /dev/null
+++ b/components/camel-jdbc/src/generated/resources/META-INF/services/org/apache/camel/assembler/jdbc-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jdbc.JdbcEndpointUriAssembler
diff --git a/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java b/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java
new file mode 100644
index 0000000..906c708
--- /dev/null
+++ b/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jgroups.raft;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JGroupsRaftEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":clusterName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jgroups-raft".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jgroups-raft/src/generated/resources/META-INF/services/org/apache/camel/assembler/jgroups-raft-endpoint b/components/camel-jgroups-raft/src/generated/resources/META-INF/services/org/apache/camel/assembler/jgroups-raft-endpoint
new file mode 100644
index 0000000..812b0df
--- /dev/null
+++ b/components/camel-jgroups-raft/src/generated/resources/META-INF/services/org/apache/camel/assembler/jgroups-raft-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jgroups.raft.JGroupsRaftEndpointUriAssembler
diff --git a/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java b/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java
new file mode 100644
index 0000000..d98164b
--- /dev/null
+++ b/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jgroups;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JGroupsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":clusterName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jgroups".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jgroups/src/generated/resources/META-INF/services/org/apache/camel/assembler/jgroups-endpoint b/components/camel-jgroups/src/generated/resources/META-INF/services/org/apache/camel/assembler/jgroups-endpoint
new file mode 100644
index 0000000..56e14e8
--- /dev/null
+++ b/components/camel-jgroups/src/generated/resources/META-INF/services/org/apache/camel/assembler/jgroups-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jgroups.JGroupsEndpointUriAssembler
diff --git a/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java b/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java
new file mode 100644
index 0000000..ccb00b1
--- /dev/null
+++ b/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.validator.jing;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JingEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jing".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jing/src/generated/resources/META-INF/services/org/apache/camel/assembler/jing-endpoint b/components/camel-jing/src/generated/resources/META-INF/services/org/apache/camel/assembler/jing-endpoint
new file mode 100644
index 0000000..87a6e2d
--- /dev/null
+++ b/components/camel-jing/src/generated/resources/META-INF/services/org/apache/camel/assembler/jing-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.validator.jing.JingEndpointUriAssembler
diff --git a/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java b/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java
new file mode 100644
index 0000000..a67b38d
--- /dev/null
+++ b/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jira;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JiraEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":type";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jira".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jira/src/generated/resources/META-INF/services/org/apache/camel/assembler/jira-endpoint b/components/camel-jira/src/generated/resources/META-INF/services/org/apache/camel/assembler/jira-endpoint
new file mode 100644
index 0000000..60ef990
--- /dev/null
+++ b/components/camel-jira/src/generated/resources/META-INF/services/org/apache/camel/assembler/jira-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jira.JiraEndpointUriAssembler
diff --git a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java
new file mode 100644
index 0000000..75a1d91
--- /dev/null
+++ b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java
@@ -0,0 +1,33 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jms;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JmsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":destinationType:destinationName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jms".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jms/src/generated/resources/META-INF/services/org/apache/camel/assembler/jms-endpoint b/components/camel-jms/src/generated/resources/META-INF/services/org/apache/camel/assembler/jms-endpoint
new file mode 100644
index 0000000..1cc7a6c
--- /dev/null
+++ b/components/camel-jms/src/generated/resources/META-INF/services/org/apache/camel/assembler/jms-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jms.JmsEndpointUriAssembler
diff --git a/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java b/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java
new file mode 100644
index 0000000..d9a425f
--- /dev/null
+++ b/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jmx;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JMXEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":serverURL";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jmx".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "serverURL", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jmx/src/generated/resources/META-INF/services/org/apache/camel/assembler/jmx-endpoint b/components/camel-jmx/src/generated/resources/META-INF/services/org/apache/camel/assembler/jmx-endpoint
new file mode 100644
index 0000000..44682fb
--- /dev/null
+++ b/components/camel-jmx/src/generated/resources/META-INF/services/org/apache/camel/assembler/jmx-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jmx.JMXEndpointUriAssembler
diff --git a/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java
new file mode 100644
index 0000000..64cb5e5
--- /dev/null
+++ b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jolt;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JoltEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jolt".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jolt/src/generated/resources/META-INF/services/org/apache/camel/assembler/jolt-endpoint b/components/camel-jolt/src/generated/resources/META-INF/services/org/apache/camel/assembler/jolt-endpoint
new file mode 100644
index 0000000..3b5bf10
--- /dev/null
+++ b/components/camel-jolt/src/generated/resources/META-INF/services/org/apache/camel/assembler/jolt-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jolt.JoltEndpointUriAssembler
diff --git a/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java
new file mode 100644
index 0000000..cc0939e
--- /dev/null
+++ b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jooq;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JooqEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":entityType";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jooq".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jooq/src/generated/resources/META-INF/services/org/apache/camel/assembler/jooq-endpoint b/components/camel-jooq/src/generated/resources/META-INF/services/org/apache/camel/assembler/jooq-endpoint
new file mode 100644
index 0000000..50ad9cc
--- /dev/null
+++ b/components/camel-jooq/src/generated/resources/META-INF/services/org/apache/camel/assembler/jooq-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jooq.JooqEndpointUriAssembler
diff --git a/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java b/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java
new file mode 100644
index 0000000..f3b0563
--- /dev/null
+++ b/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jpa;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JpaEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":entityType";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jpa".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jpa/src/generated/resources/META-INF/services/org/apache/camel/assembler/jpa-endpoint b/components/camel-jpa/src/generated/resources/META-INF/services/org/apache/camel/assembler/jpa-endpoint
new file mode 100644
index 0000000..d99f059
--- /dev/null
+++ b/components/camel-jpa/src/generated/resources/META-INF/services/org/apache/camel/assembler/jpa-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jpa.JpaEndpointUriAssembler
diff --git a/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java b/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java
new file mode 100644
index 0000000..9126a7e
--- /dev/null
+++ b/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.scp;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ScpEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host:port/directoryName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "scp".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jsch/src/generated/resources/META-INF/services/org/apache/camel/assembler/scp-endpoint b/components/camel-jsch/src/generated/resources/META-INF/services/org/apache/camel/assembler/scp-endpoint
new file mode 100644
index 0000000..3b1f4d8
--- /dev/null
+++ b/components/camel-jsch/src/generated/resources/META-INF/services/org/apache/camel/assembler/scp-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.scp.ScpEndpointUriAssembler
diff --git a/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java b/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java
new file mode 100644
index 0000000..7eaf21d
--- /dev/null
+++ b/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jslt;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JsltEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jslt".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jslt/src/generated/resources/META-INF/services/org/apache/camel/assembler/jslt-endpoint b/components/camel-jslt/src/generated/resources/META-INF/services/org/apache/camel/assembler/jslt-endpoint
new file mode 100644
index 0000000..da39ca2
--- /dev/null
+++ b/components/camel-jslt/src/generated/resources/META-INF/services/org/apache/camel/assembler/jslt-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jslt.JsltEndpointUriAssembler
diff --git a/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java b/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java
new file mode 100644
index 0000000..6fdee30
--- /dev/null
+++ b/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jsonvalidator;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JsonValidatorEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "json-validator".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-json-validator/src/generated/resources/META-INF/services/org/apache/camel/assembler/json-validator-endpoint b/components/camel-json-validator/src/generated/resources/META-INF/services/org/apache/camel/assembler/json-validator-endpoint
new file mode 100644
index 0000000..36f3de0
--- /dev/null
+++ b/components/camel-json-validator/src/generated/resources/META-INF/services/org/apache/camel/assembler/json-validator-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jsonvalidator.JsonValidatorEndpointUriAssembler
diff --git a/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java b/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java
new file mode 100644
index 0000000..2c49737
--- /dev/null
+++ b/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jsonata;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JsonataEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":resourceUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jsonata".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jsonata/src/generated/resources/META-INF/services/org/apache/camel/assembler/jsonata-endpoint b/components/camel-jsonata/src/generated/resources/META-INF/services/org/apache/camel/assembler/jsonata-endpoint
new file mode 100644
index 0000000..7506052
--- /dev/null
+++ b/components/camel-jsonata/src/generated/resources/META-INF/services/org/apache/camel/assembler/jsonata-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jsonata.JsonataEndpointUriAssembler
diff --git a/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java b/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java
new file mode 100644
index 0000000..2ffa3b4
--- /dev/null
+++ b/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java
@@ -0,0 +1,36 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jt400;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Jt400EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":userID:password/systemName/objectPath.type";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jt400".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "userID", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "password", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "systemName", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "objectPath", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jt400/src/generated/resources/META-INF/services/org/apache/camel/assembler/jt400-endpoint b/components/camel-jt400/src/generated/resources/META-INF/services/org/apache/camel/assembler/jt400-endpoint
new file mode 100644
index 0000000..30548b7
--- /dev/null
+++ b/components/camel-jt400/src/generated/resources/META-INF/services/org/apache/camel/assembler/jt400-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jt400.Jt400EndpointUriAssembler
diff --git a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java
new file mode 100644
index 0000000..fe017da
--- /dev/null
+++ b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kafka;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KafkaEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":topic";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kafka".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kafka/src/generated/resources/META-INF/services/org/apache/camel/assembler/kafka-endpoint b/components/camel-kafka/src/generated/resources/META-INF/services/org/apache/camel/assembler/kafka-endpoint
new file mode 100644
index 0000000..d02dc65
--- /dev/null
+++ b/components/camel-kafka/src/generated/resources/META-INF/services/org/apache/camel/assembler/kafka-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.kafka.KafkaEndpointUriAssembler
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java
new file mode 100644
index 0000000..62846f2
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.config_maps;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesConfigMapsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-config-maps".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java
new file mode 100644
index 0000000..e7844f1
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.deployments;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesDeploymentsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-deployments".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java
new file mode 100644
index 0000000..247ce00
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.hpa;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesHPAEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-hpa".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java
new file mode 100644
index 0000000..b9441c5
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.job;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesJobEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-job".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java
new file mode 100644
index 0000000..791af23
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.namespaces;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesNamespacesEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-namespaces".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java
new file mode 100644
index 0000000..f1368f1
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.nodes;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesNodesEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-nodes".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java
new file mode 100644
index 0000000..d88e0ab
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.persistent_volumes;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesPersistentVolumesEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-persistent-volumes".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java
new file mode 100644
index 0000000..810e5d8
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.persistent_volumes_claims;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesPersistentVolumesClaimsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-persistent-volumes-claims".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java
new file mode 100644
index 0000000..c3aa19f
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.pods;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesPodsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-pods".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java
new file mode 100644
index 0000000..bf1a103
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.replication_controllers;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesReplicationControllersEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-replication-controllers".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java
new file mode 100644
index 0000000..394acb5
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.resources_quota;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesResourcesQuotaEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-resources-quota".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java
new file mode 100644
index 0000000..e520bae
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.secrets;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KubernetesSecretsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":masterUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "kubernetes-secrets".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java
new file mode 100644
index 0000000..47a8bc0
--- /dev/null
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java
@@ -0,0 +1,32 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.kubernetes.service_accounts;
+
+import java.net.URISyntaxException;
+import java.util.Map;
... 6268 lines suppressed ...


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

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

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

commit 167118391f62f098edba9de1ba46c81c76e2aad4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Sep 24 20:08:11 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../component/EndpointUriAssemblerSupport.java     |  94 +++++++++
 .../packaging/EndpointUriAssemblerGenerator.java   |  69 ++++++
 .../maven/packaging/GenerateComponentMojo.java     |   2 +
 .../apache/camel/maven/packaging/GenerateMojo.java |   2 +
 .../GenerateUriEndpointAssemblerMojo.java          | 232 +++++++++++++++++++++
 5 files changed, 399 insertions(+)

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
new file mode 100644
index 0000000..95ea8c1
--- /dev/null
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.support.component;
+
+import java.util.List;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.NoSuchBeanException;
+import org.apache.camel.support.EndpointHelper;
+import org.apache.camel.util.TimeUtils;
+
+/**
+ * Base class used by Camel Package Maven Plugin when it generates source code for fast endpoint uri assembler via
+ * {@link org.apache.camel.spi.EndpointUriAssembler}.
+ */
+public abstract class EndpointUriAssemblerSupport {
+
+    /**
+     * Converts the property to the expected type
+     *
+     * @param  camelContext the camel context
+     * @param  type         the expected type
+     * @param  value        the value
+     * @return              the value converted to the expected type
+     */
+    public static <T> T property(CamelContext camelContext, Class<T> type, Object value) {
+        // if the type is not string based and the value is a bean reference, then we need to lookup
+        // the bean from the registry
+        if (value instanceof String && String.class != type) {
+            String text = value.toString();
+
+            if (EndpointHelper.isReferenceParameter(text)) {
+                Object obj;
+                // special for a list where we refer to beans which can be either a list or a single element
+                // so use Object.class as type
+                if (type == List.class) {
+                    obj = EndpointHelper.resolveReferenceListParameter(camelContext, text, Object.class);
+                } else {
+                    obj = EndpointHelper.resolveReferenceParameter(camelContext, text, type);
+                }
+                if (obj == null) {
+                    // no bean found so throw an exception
+                    throw new NoSuchBeanException(text, type.getName());
+                }
+                value = obj;
+            } else if (type == long.class || type == Long.class || type == int.class || type == Integer.class) {
+                Object obj = null;
+                // string to long/int then it may be a duration where we can convert the value to milli seconds
+                // it may be a time pattern, such as 5s for 5 seconds = 5000
+                try {
+                    long num = TimeUtils.toMilliSeconds(text);
+                    if (type == int.class || type == Integer.class) {
+                        // need to cast to int
+                        obj = (int) num;
+                    } else {
+                        obj = num;
+                    }
+                } catch (IllegalArgumentException e) {
+                    // ignore
+                }
+                if (obj != null) {
+                    value = obj;
+                }
+            }
+        }
+
+        // special for boolean values with string values as we only want to accept "true" or "false"
+        if ((type == Boolean.class || type == boolean.class) && value instanceof String) {
+            String text = (String) value;
+            if (!text.equalsIgnoreCase("true") && !text.equalsIgnoreCase("false")) {
+                throw new IllegalArgumentException(
+                        "Cannot convert the String value: " + value + " to type: " + type
+                                                   + " as the value is not true or false");
+            }
+        }
+
+        return camelContext.getTypeConverter().convertTo(type, value);
+    }
+
+}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
new file mode 100644
index 0000000..c097e03
--- /dev/null
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.maven.packaging;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.stream.Collectors;
+
+import org.apache.camel.tooling.model.BaseOptionModel;
+
+public final class EndpointUriAssemblerGenerator {
+
+    private EndpointUriAssemblerGenerator() {
+    }
+
+    public static void generateEndpointUriAssembler(
+            String pn, String cn, String en,
+            String pfqn, String psn,
+            Collection<? extends BaseOptionModel> options, Writer w)
+            throws IOException {
+
+        w.write("/* " + AbstractGeneratorMojo.GENERATED_MSG + " */\n");
+        w.write("package " + pn + ";\n");
+        w.write("\n");
+        w.write("import java.net.URISyntaxException;\n");
+        w.write("import java.util.Map;\n");
+        w.write("\n");
+        w.write("import org.apache.camel.CamelContext;\n");
+        w.write("import org.apache.camel.spi.EndpointUriAssembler;\n");
+        w.write("import " + pfqn + ";\n");
+        w.write("\n");
+        w.write("/**\n");
+        w.write(" * " + AbstractGeneratorMojo.GENERATED_MSG + "\n");
+        w.write(" */\n");
+        w.write("@SuppressWarnings(\"unchecked\")\n");
+        w.write("public class " + cn + " extends " + psn
+                + " implements EndpointUriAssembler {\n");
+
+        // sort options A..Z so they always have same order
+        options = options.stream().sorted(Comparator.comparing(BaseOptionModel::getName)).collect(Collectors.toList());
+
+        // generate API that returns all the options
+        w.write("\n");
+        w.write("    @Override\n");
+        w.write("    public String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) throws URISyntaxException {\n");
+        w.write("        return null;\n");
+        w.write("    }\n");
+
+        w.write("}\n");
+        w.write("\n");
+    }
+
+}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateComponentMojo.java
index c672a72..fc199c5 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateComponentMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateComponentMojo.java
@@ -44,6 +44,8 @@ public class GenerateComponentMojo extends AbstractGenerateMojo {
         invoke(GenerateConfigurerMojo.class);
         // generate-endpoint-schema
         invoke(EndpointSchemaGeneratorMojo.class);
+        // generate uri-endpoint-assembler
+        invoke(GenerateUriEndpointAssemblerMojo.class);
         // prepare-components
         invoke(PrepareComponentMojo.class);
         // validate-components
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java
index bb4ed04..de3a88d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java
@@ -44,6 +44,8 @@ public class GenerateMojo extends AbstractGenerateMojo {
         invoke(PackageModelMojo.class);
         // generate-endpoint-schema
         invoke(EndpointSchemaGeneratorMojo.class);
+        // generate uri-endpoint-assembler
+        invoke(GenerateUriEndpointAssemblerMojo.class);
         // prepare-components
         invoke(PrepareComponentMojo.class);
         // prepare-main
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateUriEndpointAssemblerMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateUriEndpointAssemblerMojo.java
new file mode 100644
index 0000000..431f2d7
--- /dev/null
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateUriEndpointAssemblerMojo.java
@@ -0,0 +1,232 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.maven.packaging;
+
+import java.io.File;
+import java.io.IOError;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.model.JsonMapper;
+import org.apache.camel.tooling.util.PackageHelper;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+import static org.apache.camel.tooling.util.PackageHelper.loadText;
+
+/**
+ * Abstract class for endpoint uri assembler generator.
+ */
+@Mojo(name = "generate-uri-endpoint-assembler", threadSafe = true, defaultPhase = LifecyclePhase.PROCESS_CLASSES,
+      requiresDependencyCollection = ResolutionScope.COMPILE,
+      requiresDependencyResolution = ResolutionScope.COMPILE)
+public class GenerateUriEndpointAssemblerMojo extends AbstractGeneratorMojo {
+
+    /**
+     * The project build directory
+     */
+    @Parameter(defaultValue = "${project.build.directory}")
+    protected File buildDir;
+
+    @Parameter(defaultValue = "${project.basedir}/src/generated/java")
+    protected File sourcesOutputDir;
+    @Parameter(defaultValue = "${project.basedir}/src/generated/resources")
+    protected File resourcesOutputDir;
+
+    public GenerateUriEndpointAssemblerMojo() {
+    }
+
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        if ("pom".equals(project.getPackaging())) {
+            return;
+        }
+
+        buildDir = new File(project.getBuild().getDirectory());
+
+        if (sourcesOutputDir == null) {
+            sourcesOutputDir = new File(project.getBasedir(), "src/generated/java");
+        }
+        if (resourcesOutputDir == null) {
+            resourcesOutputDir = new File(project.getBasedir(), "src/generated/resources");
+        }
+
+        Map<File, Supplier<String>> files;
+        try {
+            files = Files
+                    .find(buildDir.toPath(), Integer.MAX_VALUE,
+                            (p, a) -> a.isRegularFile() && p.toFile().getName().endsWith(PackageHelper.JSON_SUFIX))
+                    .collect(Collectors.toMap(Path::toFile, s -> cache(() -> loadJson(s.toFile()))));
+        } catch (IOException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+
+        executeComponent(files);
+    }
+
+    private void executeComponent(Map<File, Supplier<String>> jsonFiles) throws MojoExecutionException, MojoFailureException {
+        // find the component names
+        Set<String> componentNames = new TreeSet<>();
+        findComponentNames(buildDir, componentNames);
+
+        // create auto configuration for the components
+        if (!componentNames.isEmpty()) {
+            getLog().debug("Found " + componentNames.size() + " components");
+
+            List<ComponentModel> allModels = new LinkedList<>();
+            for (String componentName : componentNames) {
+                String json = loadComponentJson(jsonFiles, componentName);
+                if (json != null) {
+                    ComponentModel model = JsonMapper.generateComponentModel(json);
+                    allModels.add(model);
+                }
+            }
+
+            // Group the models by implementing classes
+            Map<String, List<ComponentModel>> grModels
+                    = allModels.stream().collect(Collectors.groupingBy(ComponentModel::getJavaType));
+            for (String componentClass : grModels.keySet()) {
+                List<ComponentModel> compModels = grModels.get(componentClass);
+                for (ComponentModel model : compModels) {
+                    // if more than one, we have a component class with multiple components aliases
+                    try {
+                        createEndpointUrlAssembler(model);
+                    } catch (IOException e) {
+                        throw new MojoExecutionException("Error generating source code", e);
+                    }
+                }
+            }
+        }
+    }
+
+    protected void createEndpointUrlAssembler(ComponentModel model) throws IOException {
+        getLog().info("Generating endpoint-uri-assembler: " + model.getScheme());
+
+        String fqn = model.getJavaType();
+        generateEndpointUriAssembler(fqn, fqn, model.getEndpointOptions(), sourcesOutputDir);
+
+        int pos = fqn.lastIndexOf('.');
+        String pn = fqn.substring(0, pos);
+        String cn = fqn.substring(pos + 1) + "EndpointUriAssembler";
+        // remove component from name
+        cn = cn.replace("Component", "");
+        fqn = pn + "." + cn;
+
+        String pval = model.getScheme() + "-endpoint";
+        updateResource(resourcesOutputDir.toPath(),
+                "META-INF/services/org/apache/camel/assembler/" + pval,
+                "# " + GENERATED_MSG + NL + "class=" + fqn + NL);
+
+        // META-INF/services/org/apache/camel/configurer/
+        if (model.getAlternativeSchemes() != null) {
+            String[] schemes = model.getAlternativeSchemes().split(",");
+            for (String alt : schemes) {
+                pval = alt + "-endpoint";
+                updateResource(resourcesOutputDir.toPath(),
+                        "META-INF/services/org/apache/camel/assembler/" + pval,
+                        "# " + GENERATED_MSG + NL + "class=" + fqn + NL);
+            }
+        }
+    }
+
+    @Deprecated
+    private void generateEndpointUriAssembler(
+            String fqn, String targetFqn, List<ComponentModel.EndpointOptionModel> options, File outputDir)
+            throws IOException {
+
+        int pos = targetFqn.lastIndexOf('.');
+        String pn = targetFqn.substring(0, pos);
+        String cn = targetFqn.substring(pos + 1) + "EndpointUriAssembler";
+        // remove component from name
+        cn = cn.replace("Component", "");
+        String en = fqn;
+        String pfqn = fqn;
+        String psn = "org.apache.camel.support.component.EndpointUriAssemblerSupport";
+
+        StringWriter sw = new StringWriter();
+        EndpointUriAssemblerGenerator.generateEndpointUriAssembler(pn, cn, en, pfqn, psn, options, sw);
+
+        String source = sw.toString();
+
+        String fileName = pn.replace('.', '/') + "/" + cn + ".java";
+        outputDir.mkdirs();
+        boolean updated = updateResource(buildContext, outputDir.toPath().resolve(fileName), source);
+        if (updated) {
+            getLog().info("Updated " + fileName);
+        }
+    }
+
+    protected static String loadJson(File file) {
+        try {
+            return loadText(file);
+        } catch (IOException e) {
+            throw new IOError(e);
+        }
+    }
+
+    protected static String loadComponentJson(Map<File, Supplier<String>> jsonFiles, String componentName) {
+        return loadJsonOfType(jsonFiles, componentName, "component");
+    }
+
+    protected static String loadJsonOfType(Map<File, Supplier<String>> jsonFiles, String modelName, String type) {
+        for (Map.Entry<File, Supplier<String>> entry : jsonFiles.entrySet()) {
+            if (entry.getKey().getName().equals(modelName + ".json")) {
+                String json = entry.getValue().get();
+                if (json.contains("\"kind\": \"" + type + "\"")) {
+                    return json;
+                }
+            }
+        }
+        return null;
+    }
+
+    protected void findComponentNames(File dir, Set<String> componentNames) {
+        File f = new File(dir, "classes/META-INF/services/org/apache/camel/component");
+
+        if (f.exists() && f.isDirectory()) {
+            File[] files = f.listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    // skip directories as there may be a sub .resolver
+                    // directory
+                    if (file.isDirectory()) {
+                        continue;
+                    }
+                    String name = file.getName();
+                    if (name.charAt(0) != '.') {
+                        componentNames.add(name);
+                    }
+                }
+            }
+        }
+    }
+
+}


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

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

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

commit 78c49bb54acee777e974a1cdb7f0b0a9221f6671
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 20:05:12 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java  | 2 +-
 .../java/org/apache/camel/management/ManagedNonManagedServiceTest.java  | 2 +-
 .../management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java     | 2 +-
 .../java/org/apache/camel/management/ManagedRouteAddRemoveTest.java     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
index 64d17d2..44c2dd6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
@@ -53,7 +53,7 @@ public class MultipleLifecycleStrategyTest extends TestSupport {
         List<String> expectedEvents = Arrays.asList(
                 "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd",
                 "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd",
-                "onServiceAdd",
+                "onServiceAdd", "onServiceAdd",
                 "onContextStart",
                 "onComponentAdd", "onEndpointAdd", "onComponentRemove", "onContextStop");
 
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
index 0779481..87948df 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class ManagedNonManagedServiceTest extends ManagementTestSupport {
 
-    private static final int SERVICES = 11;
+    private static final int SERVICES = 12;
 
     @Test
     public void testService() throws Exception {
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
index c88836f..faa9bc7 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementTestSupport {
 
-    private static final int SERVICES = 11;
+    private static final int SERVICES = 12;
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
index bfef164..b589ecd 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  */
 public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
 
-    private static final int SERVICES = 11;
+    private static final int SERVICES = 12;
 
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {


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

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

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

commit 21ca93638a992a2a9c3bbe12e790deea1417d554
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 12:52:53 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../camel/support/component/EndpointUriAssemblerSupport.java  |  3 +++
 .../camel/maven/packaging/EndpointUriAssemblerGenerator.java  | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
index 9b5a6f6..9dfa259 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
@@ -58,6 +58,9 @@ public abstract class EndpointUriAssemblerSupport {
                 }
             }
         }
+
+        // TODO: value == defaultValue and required = false => remove from path as that is better (eg camel-jms)
+
         return uri;
     }
 
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
index abba8520..ebb61f9 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
@@ -75,7 +75,7 @@ public final class EndpointUriAssemblerGenerator {
         w.write("\n");
         for (BaseOptionModel option : model.getEndpointPathOptions()) {
             w.write("        uri = buildPathParameter(camelContext, syntax, uri, \"" + option.getName() + "\", "
-                    + option.getDefaultValue() + ", " + option.isRequired() + ", parameters);\n");
+                    + defaultValue(option) + ", " + option.isRequired() + ", parameters);\n");
         }
         w.write("        uri = buildQueryParameters(camelContext, uri, parameters);\n");
         w.write("        return uri;\n");
@@ -108,4 +108,13 @@ public final class EndpointUriAssemblerGenerator {
         return base;
     }
 
+    private static Object defaultValue(BaseOptionModel option) {
+        Object obj = option.getDefaultValue();
+        if (obj instanceof String) {
+            return "\"" + obj + "\"";
+        } else {
+            return obj;
+        }
+    }
+
 }


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

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

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

commit b497a65a5f325b736240b6a39705bdc9db0d853e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 11:44:00 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../component/ahc/AhcEndpointUriAssembler.java     |  12 +-
 .../jetty9/JettyHttp9EndpointUriAssembler.java     |  12 +-
 .../component/log/LogEndpointUriAssembler.java}    |  16 ++-
 .../org/apache/camel/assembler/log-endpoint        |   2 +
 .../component/mail/MailEndpointUriAssembler.java   |  39 +++++++
 .../org/apache/camel/assembler/imap-endpoint       |   2 +
 .../org/apache/camel/assembler/imaps-endpoint      |   2 +
 .../org/apache/camel/assembler/pop3-endpoint       |   2 +
 .../org/apache/camel/assembler/pop3s-endpoint      |   2 +
 .../org/apache/camel/assembler/smtp-endpoint       |   2 +
 .../org/apache/camel/assembler/smtps-endpoint      |   2 +
 .../netty/http/NettyHttpEndpointUriAssembler.java  |  18 ++-
 .../org/apache/camel/ExtendedCamelContext.java     |  11 ++
 ...intUriAssembler.java => AssemblerResolver.java} |  21 ++--
 .../org/apache/camel/spi/EndpointUriAssembler.java |   5 +-
 .../camel/impl/engine/AbstractCamelContext.java    |  28 +++--
 .../impl/engine/DefaultAssemblerResolver.java      | 126 +++++++++++++++++++++
 .../camel/impl/engine/SimpleCamelContext.java      |   6 +
 .../impl/CamelCatalogEndpointUriAssembler.java     |   7 ++
 .../camel/impl/ExtendedCamelContextConfigurer.java |   5 +
 .../camel/impl/lw/LightweightCamelContext.java     |  11 ++
 .../impl/lw/LightweightRuntimeCamelContext.java    |  12 +-
 .../catalog/CustomEndpointUriAssemblerTest.java    |  29 ++++-
 .../component/log/LogEndpointUriAssemblerTest.java |  31 +++++
 .../apache/camel/impl/AssembleResolverTest.java    |  43 +++++++
 .../component/EndpointUriAssemblerSupport.java     |   2 +-
 .../packaging/EndpointUriAssemblerGenerator.java   |  51 ++++++++-
 27 files changed, 454 insertions(+), 45 deletions(-)

diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
index 3e3d8ae..d2860d0 100644
--- a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
+++ b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
@@ -12,13 +12,19 @@ import org.apache.camel.spi.EndpointUriAssembler;
  */
 public class AhcEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
 
-    private static final String SYNTAX = "ahc:httpUri";
+    private static final String BASE = ":httpUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "ahc".equals(scheme);
+    }
 
     @Override
     public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String uri = SYNTAX;
+        String syntax = scheme + BASE;
+        String uri = syntax;
 
-        uri = buildPathParameter(camelContext, SYNTAX, uri, "httpUri", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
         uri = buildQueryParameters(camelContext, uri, parameters);
         return uri;
     }
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
index e0f4418..68943b1c 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
@@ -12,13 +12,19 @@ import org.apache.camel.spi.EndpointUriAssembler;
  */
 public class JettyHttp9EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
 
-    private static final String SYNTAX = "jetty:httpUri";
+    private static final String BASE = ":httpUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "jetty".equals(scheme);
+    }
 
     @Override
     public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String uri = SYNTAX;
+        String syntax = scheme + BASE;
+        String uri = syntax;
 
-        uri = buildPathParameter(camelContext, SYNTAX, uri, "httpUri", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
         uri = buildQueryParameters(camelContext, uri, parameters);
         return uri;
     }
diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java b/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
similarity index 58%
copy from components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
copy to components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
index 3e3d8ae..250bb46 100644
--- a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
+++ b/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
@@ -1,5 +1,5 @@
 /* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.ahc;
+package org.apache.camel.component.log;
 
 import java.net.URISyntaxException;
 import java.util.Map;
@@ -10,15 +10,21 @@ import org.apache.camel.spi.EndpointUriAssembler;
 /**
  * Generated by camel build tools - do NOT edit this file!
  */
-public class AhcEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+public class LogEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
 
-    private static final String SYNTAX = "ahc:httpUri";
+    private static final String BASE = ":loggerName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "log".equals(scheme);
+    }
 
     @Override
     public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String uri = SYNTAX;
+        String syntax = scheme + BASE;
+        String uri = syntax;
 
-        uri = buildPathParameter(camelContext, SYNTAX, uri, "httpUri", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "loggerName", null, true, parameters);
         uri = buildQueryParameters(camelContext, uri, parameters);
         return uri;
     }
diff --git a/components/camel-log/src/generated/resources/META-INF/services/org/apache/camel/assembler/log-endpoint b/components/camel-log/src/generated/resources/META-INF/services/org/apache/camel/assembler/log-endpoint
new file mode 100644
index 0000000..f461f57
--- /dev/null
+++ b/components/camel-log/src/generated/resources/META-INF/services/org/apache/camel/assembler/log-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.log.LogEndpointUriAssembler
diff --git a/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java
new file mode 100644
index 0000000..f5fae41
--- /dev/null
+++ b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java
@@ -0,0 +1,39 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.mail;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class MailEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String BASE = ":host:port";
+    private static final String[] SCHEMES = new String[]{"imap", "imaps", "pop3", "pop3s", "smtp", "smtps"};
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        for (String s : SCHEMES) {
+            if (s.equals(scheme)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/imap-endpoint b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/imap-endpoint
new file mode 100644
index 0000000..500af80
--- /dev/null
+++ b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/imap-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.mail.MailEndpointUriAssembler
diff --git a/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/imaps-endpoint b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/imaps-endpoint
new file mode 100644
index 0000000..500af80
--- /dev/null
+++ b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/imaps-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.mail.MailEndpointUriAssembler
diff --git a/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/pop3-endpoint b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/pop3-endpoint
new file mode 100644
index 0000000..500af80
--- /dev/null
+++ b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/pop3-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.mail.MailEndpointUriAssembler
diff --git a/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/pop3s-endpoint b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/pop3s-endpoint
new file mode 100644
index 0000000..500af80
--- /dev/null
+++ b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/pop3s-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.mail.MailEndpointUriAssembler
diff --git a/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/smtp-endpoint b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/smtp-endpoint
new file mode 100644
index 0000000..500af80
--- /dev/null
+++ b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/smtp-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.mail.MailEndpointUriAssembler
diff --git a/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/smtps-endpoint b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/smtps-endpoint
new file mode 100644
index 0000000..500af80
--- /dev/null
+++ b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/assembler/smtps-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.mail.MailEndpointUriAssembler
diff --git a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
index e252977..3bc4475 100644
--- a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
+++ b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
@@ -12,16 +12,22 @@ import org.apache.camel.spi.EndpointUriAssembler;
  */
 public class NettyHttpEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
 
-    private static final String SYNTAX = "netty-http:protocol:host:port/path";
+    private static final String BASE = ":protocol:host:port/path";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "netty-http".equals(scheme);
+    }
 
     @Override
     public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String uri = SYNTAX;
+        String syntax = scheme + BASE;
+        String uri = syntax;
 
-        uri = buildPathParameter(camelContext, SYNTAX, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, SYNTAX, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, SYNTAX, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, SYNTAX, uri, "path", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
         uri = buildQueryParameters(camelContext, uri, parameters);
         return uri;
     }
diff --git a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index 4122a85..239e163 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -25,6 +25,7 @@ import java.util.concurrent.ScheduledExecutorService;
 
 import org.apache.camel.catalog.RuntimeCamelCatalog;
 import org.apache.camel.spi.AnnotationBasedProcessorFactory;
+import org.apache.camel.spi.AssemblerResolver;
 import org.apache.camel.spi.AsyncProcessorAwaitManager;
 import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spi.BeanProcessorFactory;
@@ -551,6 +552,16 @@ public interface ExtendedCamelContext extends CamelContext {
     void setConfigurerResolver(ConfigurerResolver configurerResolver);
 
     /**
+     * Gets the {@link AssemblerResolver} to use.
+     */
+    AssemblerResolver getAssemblerResolver();
+
+    /**
+     * Sets the {@link AssemblerResolver} to use.
+     */
+    void setAssemblerResolver(AssemblerResolver assemblerResolver);
+
+    /**
      * Internal {@link RouteController} that are only used internally by Camel to perform basic route operations. Do not
      * use this as end user.
      */
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java b/core/camel-api/src/main/java/org/apache/camel/spi/AssemblerResolver.java
similarity index 59%
copy from core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
copy to core/camel-api/src/main/java/org/apache/camel/spi/AssemblerResolver.java
index c1ed600..7e55562 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/AssemblerResolver.java
@@ -16,26 +16,19 @@
  */
 package org.apache.camel.spi;
 
-import java.net.URISyntaxException;
-import java.util.Map;
-
 import org.apache.camel.CamelContext;
 
 /**
- * To assemble an endpoint uri String from a map of parameters.
+ * A pluggable strategy for resolving different assemblers in a loosely coupled manner
  */
-public interface EndpointUriAssembler {
-
-    // TODO: Consider a better name.
+public interface AssemblerResolver {
 
     /**
-     * Assembles an endpoint uri for the given component name with the given parameters.
+     * Resolves the given assembler.
      *
-     * @param  camelContext the Camel context
-     * @param  scheme       the component name
-     * @param  parameters   endpoint options
-     * @return              the constructed endpoint uri
+     * @param  name    the name of the assembler (timer-endpoint etc)
+     * @param  context the camel context
+     * @return         the resolved assembler, or <tt>null</tt> if no assembler could be found
      */
-    String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException;
-
+    EndpointUriAssembler resolveAssembler(String name, CamelContext context);
 }
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
index c1ed600..427d526 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
@@ -26,7 +26,10 @@ import org.apache.camel.CamelContext;
  */
 public interface EndpointUriAssembler {
 
-    // TODO: Consider a better name.
+    /**
+     * Checks whether this assembler supports the given component name
+     */
+    boolean isEnabled(String scheme);
 
     /**
      * Assembles an endpoint uri for the given component name with the given parameters.
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index dd810cb..c549440 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -77,6 +77,7 @@ import org.apache.camel.impl.transformer.TransformerKey;
 import org.apache.camel.impl.validator.ValidatorKey;
 import org.apache.camel.spi.AnnotationBasedProcessorFactory;
 import org.apache.camel.spi.AnnotationScanTypeConverters;
+import org.apache.camel.spi.AssemblerResolver;
 import org.apache.camel.spi.AsyncProcessorAwaitManager;
 import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spi.BeanProcessorFactory;
@@ -257,6 +258,7 @@ public abstract class AbstractCamelContext extends BaseService
     private volatile ComponentNameResolver componentNameResolver;
     private volatile LanguageResolver languageResolver;
     private volatile ConfigurerResolver configurerResolver;
+    private volatile AssemblerResolver assemblerResolver;
     private volatile DataFormatResolver dataFormatResolver;
     private volatile ManagementStrategy managementStrategy;
     private volatile ManagementMBeanAssembler managementMBeanAssembler;
@@ -1876,6 +1878,21 @@ public abstract class AbstractCamelContext extends BaseService
         this.configurerResolver = doAddService(configurerResolver);
     }
 
+    public AssemblerResolver getAssemblerResolver() {
+        if (assemblerResolver == null) {
+            synchronized (lock) {
+                if (assemblerResolver == null) {
+                    setAssemblerResolver(createAssemblerResolver());
+                }
+            }
+        }
+        return assemblerResolver;
+    }
+
+    public void setAssemblerResolver(AssemblerResolver assemblerResolver) {
+        this.assemblerResolver = doAddService(assemblerResolver);
+    }
+
     public boolean isAutoCreateComponents() {
         return autoCreateComponents;
     }
@@ -3206,6 +3223,7 @@ public abstract class AbstractCamelContext extends BaseService
         getRegistry();
         getLanguageResolver();
         getConfigurerResolver();
+        getAssemblerResolver();
         getExecutorServiceManager();
         getInflightRepository();
         getAsyncProcessorAwaitManager();
@@ -4208,6 +4226,8 @@ public abstract class AbstractCamelContext extends BaseService
 
     protected abstract ConfigurerResolver createConfigurerResolver();
 
+    protected abstract AssemblerResolver createAssemblerResolver();
+
     protected abstract RestRegistryFactory createRestRegistryFactory();
 
     protected abstract EndpointRegistry<EndpointKey> createEndpointRegistry(Map<EndpointKey, Endpoint> endpoints);
@@ -4237,13 +4257,7 @@ public abstract class AbstractCamelContext extends BaseService
 
     @Override
     public EndpointUriAssembler getEndpointUriAssembler(String scheme) {
-        // TODO: lookup factory specific for a given component
-
-        // no specific factory found so lets fallback to use runtime catalog
-        return new BaseServiceResolver<>(RuntimeCamelCatalog.ENDPOINT_URI_ASSEMBLER_FACTORY, EndpointUriAssembler.class)
-                .resolve(getCamelContextReference())
-                .orElseThrow(() -> new IllegalArgumentException(
-                        "Cannot find RuntimeCamelCatalog on classpath. Add camel-core-catalog to classpath."));
+        return getAssemblerResolver().resolveAssembler(scheme, this);
     }
 
     public enum Initialization {
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAssemblerResolver.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAssemblerResolver.java
new file mode 100644
index 0000000..c8ffea6
--- /dev/null
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultAssemblerResolver.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.impl.engine;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.NoFactoryAvailableException;
+import org.apache.camel.spi.AssemblerResolver;
+import org.apache.camel.spi.EndpointUriAssembler;
+import org.apache.camel.spi.FactoryFinder;
+import org.apache.camel.support.LRUCacheFactory;
+import org.apache.camel.support.service.ServiceSupport;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Default assembler resolver that looks for assembler factories in
+ * <b>META-INF/services/org/apache/camel/assembler/</b>.
+ */
+public class DefaultAssemblerResolver extends ServiceSupport implements CamelContextAware, AssemblerResolver {
+    public static final String RESOURCE_PATH = "META-INF/services/org/apache/camel/assembler/";
+
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultAssemblerResolver.class);
+
+    private final Map<String, EndpointUriAssembler> cache = LRUCacheFactory.newLRUSoftCache(1000);
+    private CamelContext camelContext;
+    private FactoryFinder factoryFinder;
+
+    @Override
+    public CamelContext getCamelContext() {
+        return camelContext;
+    }
+
+    @Override
+    public void setCamelContext(CamelContext camelContext) {
+        this.camelContext = camelContext;
+    }
+
+    @Override
+    public EndpointUriAssembler resolveAssembler(final String name, CamelContext context) {
+        if (ObjectHelper.isEmpty(name)) {
+            return null;
+        }
+
+        EndpointUriAssembler answer = cache.get(name);
+        if (answer != null) {
+            return answer;
+        }
+
+        // lookup in registry first
+        Set<EndpointUriAssembler> assemblers = context.getRegistry().findByType(EndpointUriAssembler.class);
+        answer = assemblers.stream().filter(a -> a.isEnabled(name)).findFirst().orElse(null);
+        if (answer != null) {
+            cache.put(name, answer);
+            return answer;
+        }
+
+        // not in registry then use assembler factory for endpoints
+        Class<?> type;
+        try {
+            type = findAssembler(name + "-endpoint", context);
+        } catch (NoFactoryAvailableException e) {
+            // its optional so its okay
+            type = null;
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Invalid URI, no Assembler registered for scheme: " + name, e);
+        }
+
+        if (type != null) {
+            if (getLog().isDebugEnabled()) {
+                getLog().debug("Found assembler: {} via type: {} via: {}{}", name, type.getName(),
+                        factoryFinder.getResourcePath(),
+                        name);
+            }
+
+            // create the assembler
+            if (EndpointUriAssembler.class.isAssignableFrom(type)) {
+                answer = (EndpointUriAssembler) context.getInjector().newInstance(type, false);
+                cache.put(name, answer);
+                return answer;
+            } else {
+                throw new IllegalArgumentException(
+                        "Type is not a EndpointUriAssembler implementation. Found: " + type.getName());
+            }
+        }
+
+        return answer;
+    }
+
+    private Class<?> findAssembler(String name, CamelContext context) throws IOException {
+        if (factoryFinder == null) {
+            factoryFinder = context.adapt(ExtendedCamelContext.class).getFactoryFinder(RESOURCE_PATH);
+        }
+        return factoryFinder.findClass(name).orElse(null);
+    }
+
+    protected Logger getLog() {
+        return LOG;
+    }
+
+    @Override
+    protected void doStop() throws Exception {
+        cache.clear();
+    }
+
+}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
index 952f00d..0391da8 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
@@ -32,6 +32,7 @@ import org.apache.camel.impl.converter.DefaultTypeConverter;
 import org.apache.camel.impl.transformer.TransformerKey;
 import org.apache.camel.impl.validator.ValidatorKey;
 import org.apache.camel.processor.MulticastProcessor;
+import org.apache.camel.spi.AssemblerResolver;
 import org.apache.camel.spi.AsyncProcessorAwaitManager;
 import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spi.BeanProcessorFactory;
@@ -360,6 +361,11 @@ public class SimpleCamelContext extends AbstractCamelContext {
     }
 
     @Override
+    protected AssemblerResolver createAssemblerResolver() {
+        return new DefaultAssemblerResolver();
+    }
+
+    @Override
     protected RestRegistryFactory createRestRegistryFactory() {
         return new BaseServiceResolver<>(RestRegistryFactory.FACTORY, RestRegistryFactory.class)
                 .resolve(getCamelContextReference())
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java
index 7245b8d..13aaba1 100644
--- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java
+++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java
@@ -17,9 +17,16 @@ import static org.apache.camel.catalog.RuntimeCamelCatalog.ENDPOINT_URI_ASSEMBLE
  * Uses {@link RuntimeCamelCatalog} to assemble the endpoint uri.
  */
 @JdkService(ENDPOINT_URI_ASSEMBLER_FACTORY)
+@Deprecated
 public class CamelCatalogEndpointUriAssembler implements EndpointUriAssembler {
 
     @Override
+    public boolean isEnabled(String scheme) {
+        // as its a fallback then assume it can handle this
+        return true;
+    }
+
+    @Override
     public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) {
         try {
             Map<String, String> copy = new LinkedHashMap<>();
diff --git a/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java
index 74b77e7..1cfa827 100644
--- a/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java
+++ b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/ExtendedCamelContextConfigurer.java
@@ -23,6 +23,8 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
         case "AllowUseOriginalMessage": target.setAllowUseOriginalMessage(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "applicationcontextclassloader":
         case "ApplicationContextClassLoader": target.setApplicationContextClassLoader(property(camelContext, java.lang.ClassLoader.class, value)); return true;
+        case "assemblerresolver":
+        case "AssemblerResolver": target.setAssemblerResolver(property(camelContext, org.apache.camel.spi.AssemblerResolver.class, value)); return true;
         case "asyncprocessorawaitmanager":
         case "AsyncProcessorAwaitManager": target.setAsyncProcessorAwaitManager(property(camelContext, org.apache.camel.spi.AsyncProcessorAwaitManager.class, value)); return true;
         case "autostartup":
@@ -162,6 +164,7 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
         Map<String, Object> answer = new CaseInsensitiveMap();
         answer.put("AllowUseOriginalMessage", java.lang.Boolean.class);
         answer.put("ApplicationContextClassLoader", java.lang.ClassLoader.class);
+        answer.put("AssemblerResolver", org.apache.camel.spi.AssemblerResolver.class);
         answer.put("AsyncProcessorAwaitManager", org.apache.camel.spi.AsyncProcessorAwaitManager.class);
         answer.put("AutoStartup", java.lang.Boolean.class);
         answer.put("BacklogTracing", java.lang.Boolean.class);
@@ -238,6 +241,8 @@ public class ExtendedCamelContextConfigurer extends org.apache.camel.support.com
         case "AllowUseOriginalMessage": return target.isAllowUseOriginalMessage();
         case "applicationcontextclassloader":
         case "ApplicationContextClassLoader": return target.getApplicationContextClassLoader();
+        case "assemblerresolver":
+        case "AssemblerResolver": return target.getAssemblerResolver();
         case "asyncprocessorawaitmanager":
         case "AsyncProcessorAwaitManager": return target.getAsyncProcessorAwaitManager();
         case "autostartup":
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
index 235fdfa..139b69b 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
@@ -71,6 +71,7 @@ import org.apache.camel.model.transformer.TransformerDefinition;
 import org.apache.camel.model.validator.ValidatorDefinition;
 import org.apache.camel.processor.channel.DefaultChannel;
 import org.apache.camel.spi.AnnotationBasedProcessorFactory;
+import org.apache.camel.spi.AssemblerResolver;
 import org.apache.camel.spi.AsyncProcessorAwaitManager;
 import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spi.BeanProcessorFactory;
@@ -1412,6 +1413,16 @@ public class LightweightCamelContext implements ExtendedCamelContext, CatalogCam
     }
 
     @Override
+    public AssemblerResolver getAssemblerResolver() {
+        return getExtendedCamelContext().getAssemblerResolver();
+    }
+
+    @Override
+    public void setAssemblerResolver(AssemblerResolver assemblerResolver) {
+        getExtendedCamelContext().setAssemblerResolver(assemblerResolver);
+    }
+
+    @Override
     public RouteController getInternalRouteController() {
         return getExtendedCamelContext().getInternalRouteController();
     }
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
index 4c993ae..cbc7fc8 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java
@@ -67,6 +67,7 @@ import org.apache.camel.impl.engine.DefaultDataFormatResolver;
 import org.apache.camel.impl.engine.DefaultLanguageResolver;
 import org.apache.camel.impl.engine.EndpointKey;
 import org.apache.camel.spi.AnnotationBasedProcessorFactory;
+import org.apache.camel.spi.AssemblerResolver;
 import org.apache.camel.spi.AsyncProcessorAwaitManager;
 import org.apache.camel.spi.BeanIntrospection;
 import org.apache.camel.spi.BeanProcessorFactory;
@@ -1858,8 +1859,17 @@ public class LightweightRuntimeCamelContext implements ExtendedCamelContext, Cat
     }
 
     @Override
+    public AssemblerResolver getAssemblerResolver() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setAssemblerResolver(AssemblerResolver assemblerResolver) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
     public EndpointUriAssembler getEndpointUriAssembler(String scheme) {
-        // TODO: If this experiment is continued then this should be implemented
         throw new UnsupportedOperationException();
     }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
index 30ef452..4dbdb16 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
@@ -23,6 +23,7 @@ import java.util.Map;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 import org.apache.camel.support.component.EndpointUriAssemblerSupport;
 import org.junit.jupiter.api.Assertions;
@@ -45,6 +46,21 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
     }
 
     @Test
+    public void testCustomAssembleRegistry() throws Exception {
+        context.getRegistry().bind("myAssembler", new MyAssembler());
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("name", "foo");
+        params.put("amount", "123");
+        params.put("port", 4444);
+        params.put("verbose", true);
+
+        EndpointUriAssembler assembler = context.adapt(ExtendedCamelContext.class).getEndpointUriAssembler("acme");
+        String uri = assembler.buildUri(context, "acme", params);
+        Assertions.assertEquals("acme:foo:4444?amount=123&verbose=true", uri);
+    }
+
+    @Test
     public void testCustomAssembleUnsorted() throws Exception {
         EndpointUriAssembler assembler = new MyAssembler();
 
@@ -71,7 +87,8 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
             assembler.buildUri(context, "acme", params);
             Assertions.fail();
         } catch (IllegalArgumentException e) {
-            Assertions.assertEquals("Option name is required when creating endpoint uri with syntax acme:name:port", e.getMessage());
+            Assertions.assertEquals("Option name is required when creating endpoint uri with syntax acme:name:port",
+                    e.getMessage());
         }
     }
 
@@ -149,6 +166,11 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         private static final String SYNTAX = "acme:name:port";
 
         @Override
+        public boolean isEnabled(String scheme) {
+            return "acme".equals(scheme);
+        }
+
+        @Override
         public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters)
                 throws URISyntaxException {
             // begin from syntax
@@ -170,6 +192,11 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         private static final String SYNTAX = "acme2:name/path:port";
 
         @Override
+        public boolean isEnabled(String scheme) {
+            return "acme2".equals(scheme);
+        }
+
+        @Override
         public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters)
                 throws URISyntaxException {
             // begin from syntax
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointUriAssemblerTest.java
new file mode 100644
index 0000000..f8115fd
--- /dev/null
+++ b/core/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointUriAssemblerTest.java
@@ -0,0 +1,31 @@
+package org.apache.camel.component.log;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class LogEndpointUriAssemblerTest extends ContextTestSupport {
+
+    @Test
+    public void testLogAssembler() throws Exception {
+        Map<String, Object> params = new HashMap<>();
+        params.put("loggerName", "foo");
+        params.put("groupSize", "123");
+        params.put("showExchangePattern", false);
+        params.put("logMask", true);
+
+        // should find the source code generated assembler via classpath
+        EndpointUriAssembler assembler = context.adapt(ExtendedCamelContext.class).getEndpointUriAssembler("log");
+        Assertions.assertNotNull(assembler);
+        boolean generated = assembler instanceof LogEndpointUriAssembler;
+        Assertions.assertTrue(generated);
+
+        String uri = assembler.buildUri(context, "log", params);
+        Assertions.assertEquals("log:foo?groupSize=123&logMask=true&showExchangePattern=false", uri);
+    }
+}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/AssembleResolverTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/AssembleResolverTest.java
new file mode 100644
index 0000000..f4225d9
--- /dev/null
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/AssembleResolverTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.impl;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.catalog.impl.CamelCatalogEndpointUriAssembler;
+import org.apache.camel.spi.EndpointUriAssembler;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class AssembleResolverTest extends ContextTestSupport {
+
+    @Test
+    public void testAssembleResolver() throws Exception {
+        // will use source code generated
+        EndpointUriAssembler assembler = context.adapt(ExtendedCamelContext.class).getAssemblerResolver()
+                .resolveAssembler("log", context);
+        Assertions.assertNotNull(assembler);
+        // TODO: check classname
+
+        // will then use fallback that is catalog based
+        assembler = context.adapt(ExtendedCamelContext.class).getAssemblerResolver()
+                .resolveAssembler("unknown", context);
+        Assertions.assertNotNull(assembler);
+        boolean catalog = assembler instanceof CamelCatalogEndpointUriAssembler;
+        Assertions.assertTrue(catalog);
+    }
+}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
index d3e1c8c..9b5a6f6 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
@@ -49,7 +49,7 @@ public abstract class EndpointUriAssemblerSupport {
             int pos = uri.indexOf(name);
             if (pos != -1) {
                 // remove from syntax
-                uri = uri.replace(name, "");
+                uri = uri.replaceFirst(name, "");
                 pos = pos - 1;
                 // remove the separator char
                 char ch = uri.charAt(pos);
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
index 01b2e38..abba8520 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
@@ -18,6 +18,7 @@ package org.apache.camel.maven.packaging;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.util.StringJoiner;
 
 import org.apache.camel.tooling.model.BaseOptionModel;
 import org.apache.camel.tooling.model.ComponentModel;
@@ -46,14 +47,34 @@ public final class EndpointUriAssemblerGenerator {
         w.write(" */\n");
         w.write("public class " + cn + " extends " + psn + " implements EndpointUriAssembler {\n");
         w.write("\n");
-        w.write("    private static final String SYNTAX = \"" + model.getSyntax() + "\";\n");
+        w.write("    private static final String BASE = \"" + baseSyntax(model) + "\";\n");
+
+        String alternative = alternativeSchemes(model);
+        if (alternative != null) {
+            w.write("    private static final String[] SCHEMES = " + alternative + ";\n");
+        }
+        w.write("\n");
+        w.write("    @Override\n");
+        w.write("    public boolean isEnabled(String scheme) {\n");
+        if (alternative == null) {
+            w.write("        return \"" + model.getScheme() + "\".equals(scheme);\n");
+        } else {
+            w.write("        for (String s : SCHEMES) {\n");
+            w.write("            if (s.equals(scheme)) {\n");
+            w.write("                return true;\n");
+            w.write("            }\n");
+            w.write("        }\n");
+            w.write("        return false;\n");
+        }
+        w.write("    }\n");
         w.write("\n");
         w.write("    @Override\n");
         w.write("    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {\n");
-        w.write("        String uri = SYNTAX;\n");
+        w.write("        String syntax = scheme + BASE;\n");
+        w.write("        String uri = syntax;\n");
         w.write("\n");
         for (BaseOptionModel option : model.getEndpointPathOptions()) {
-            w.write("        uri = buildPathParameter(camelContext, SYNTAX, uri, \"" + option.getName() + "\", "
+            w.write("        uri = buildPathParameter(camelContext, syntax, uri, \"" + option.getName() + "\", "
                     + option.getDefaultValue() + ", " + option.isRequired() + ", parameters);\n");
         }
         w.write("        uri = buildQueryParameters(camelContext, uri, parameters);\n");
@@ -63,4 +84,28 @@ public final class EndpointUriAssemblerGenerator {
         w.write("\n");
     }
 
+    private static String alternativeSchemes(ComponentModel model) {
+        StringBuilder sb = new StringBuilder();
+        if (model.getAlternativeSchemes() != null) {
+            sb.append("new String[]{");
+            String[] alts = model.getAlternativeSchemes().split(",");
+            StringJoiner sj = new StringJoiner(", ");
+            for (String alt : alts) {
+                sj.add("\"" + alt + "\"");
+            }
+            sb.append(sj.toString());
+            sb.append("}");
+        }
+        if (sb.length() == 0) {
+            return null;
+        }
+        return sb.toString();
+    }
+
+    private static String baseSyntax(ComponentModel model) {
+        String base = model.getSyntax();
+        base = base.replaceFirst(model.getScheme(), "");
+        return base;
+    }
+
 }


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

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

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

commit b993020df4dfe7edf115e521ae16eea29a7c83ac
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 19:32:21 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../org/apache/camel/component/log/LogEndpointUriAssemblerTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointUriAssemblerTest.java
index 2fe93bb..7af2ef5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointUriAssemblerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointUriAssemblerTest.java
@@ -22,7 +22,7 @@ public class LogEndpointUriAssemblerTest extends ContextTestSupport {
         // should find the source code generated assembler via classpath
         EndpointUriFactory assembler = context.adapt(ExtendedCamelContext.class).getEndpointUriFactory("log");
         Assertions.assertNotNull(assembler);
-        boolean generated = assembler instanceof LogEndpointUriAssembler;
+        boolean generated = assembler instanceof LogEndpointUriFactory;
         Assertions.assertTrue(generated);
 
         String uri = assembler.buildUri("log", params);


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

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

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

commit f2034e1df7fa6459a88828669b42335060ffa099
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 10:11:26 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../jetty9/JettyHttp9EndpointUriAssembler.java     |  26 ++++
 .../org/apache/camel/assembler/jetty-endpoint      |   2 +
 .../netty/http/NettyHttpEndpointUriAssembler.java  |  29 +++++
 .../org/apache/camel/assembler/netty-http-endpoint |   2 +
 .../catalog/CustomEndpointUriAssemblerTest.java    | 135 +++++++++++++++++++--
 .../component/EndpointUriAssemblerSupport.java     |  13 ++
 6 files changed, 194 insertions(+), 13 deletions(-)

diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
new file mode 100644
index 0000000..e0f4418
--- /dev/null
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
@@ -0,0 +1,26 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jetty9;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class JettyHttp9EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String SYNTAX = "jetty:httpUri";
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String uri = SYNTAX;
+
+        uri = buildPathParameter(camelContext, SYNTAX, uri, "httpUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/assembler/jetty-endpoint b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/assembler/jetty-endpoint
new file mode 100644
index 0000000..7f8e7ed
--- /dev/null
+++ b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/assembler/jetty-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.jetty9.JettyHttp9EndpointUriAssembler
diff --git a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
new file mode 100644
index 0000000..e252977
--- /dev/null
+++ b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
@@ -0,0 +1,29 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.netty.http;
+
+import java.net.URISyntaxException;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class NettyHttpEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+    private static final String SYNTAX = "netty-http:protocol:host:port/path";
+
+    @Override
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String uri = SYNTAX;
+
+        uri = buildPathParameter(camelContext, SYNTAX, uri, "protocol", null, true, parameters);
+        uri = buildPathParameter(camelContext, SYNTAX, uri, "host", null, true, parameters);
+        uri = buildPathParameter(camelContext, SYNTAX, uri, "port", null, false, parameters);
+        uri = buildPathParameter(camelContext, SYNTAX, uri, "path", null, false, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
+    }
+}
+
diff --git a/components/camel-netty-http/src/generated/resources/META-INF/services/org/apache/camel/assembler/netty-http-endpoint b/components/camel-netty-http/src/generated/resources/META-INF/services/org/apache/camel/assembler/netty-http-endpoint
new file mode 100644
index 0000000..98e4c6b
--- /dev/null
+++ b/components/camel-netty-http/src/generated/resources/META-INF/services/org/apache/camel/assembler/netty-http-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.netty.http.NettyHttpEndpointUriAssembler
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
index f5097da..30ef452 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
@@ -35,12 +35,13 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         EndpointUriAssembler assembler = new MyAssembler();
 
         Map<String, Object> params = new HashMap<>();
-        params.put("timerName", "foo");
-        params.put("period", 123);
-        params.put("repeatCount", "5");
+        params.put("name", "foo");
+        params.put("amount", "123");
+        params.put("port", 4444);
+        params.put("verbose", true);
 
-        String uri = assembler.buildUri(context, "timer", params);
-        Assertions.assertEquals("timer:foo?period=123&repeatCount=5", uri);
+        String uri = assembler.buildUri(context, "acme", params);
+        Assertions.assertEquals("acme:foo:4444?amount=123&verbose=true", uri);
     }
 
     @Test
@@ -48,17 +49,104 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         EndpointUriAssembler assembler = new MyAssembler();
 
         Map<String, Object> params = new LinkedHashMap<>();
-        params.put("timerName", "foo");
-        params.put("repeatCount", 5);
-        params.put("period", "123");
+        params.put("name", "foo");
+        params.put("verbose", false);
+        params.put("port", 4444);
+        params.put("amount", "123");
 
-        String uri = assembler.buildUri(context, "timer", params);
-        Assertions.assertEquals("timer:foo?period=123&repeatCount=5", uri);
+        String uri = assembler.buildUri(context, "acme", params);
+        Assertions.assertEquals("acme:foo:4444?amount=123&verbose=false", uri);
+    }
+
+    @Test
+    public void testCustomAssembleNoMandatory() throws Exception {
+        EndpointUriAssembler assembler = new MyAssembler();
+
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("verbose", false);
+        params.put("port", 4444);
+        params.put("amount", "123");
+
+        try {
+            assembler.buildUri(context, "acme", params);
+            Assertions.fail();
+        } catch (IllegalArgumentException e) {
+            Assertions.assertEquals("Option name is required when creating endpoint uri with syntax acme:name:port", e.getMessage());
+        }
+    }
+
+    @Test
+    public void testCustomAssembleDefault() throws Exception {
+        EndpointUriAssembler assembler = new MyAssembler();
+
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("name", "bar");
+        params.put("verbose", false);
+        params.put("amount", "123");
+
+        String uri = assembler.buildUri(context, "acme", params);
+        Assertions.assertEquals("acme:bar:8080?amount=123&verbose=false", uri);
+    }
+
+    @Test
+    public void testCustomAssembleComplex() throws Exception {
+        EndpointUriAssembler assembler = new MySecondAssembler();
+
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("name", "bar");
+        params.put("path", "moes");
+        params.put("verbose", true);
+        params.put("amount", "123");
+
+        String uri = assembler.buildUri(context, "acme2", params);
+        Assertions.assertEquals("acme2:bar/moes:8080?amount=123&verbose=true", uri);
+    }
+
+    @Test
+    public void testCustomAssembleComplexPort() throws Exception {
+        EndpointUriAssembler assembler = new MySecondAssembler();
+
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("name", "bar");
+        params.put("path", "moes");
+        params.put("port", "4444");
+        params.put("verbose", true);
+        params.put("amount", "123");
+
+        String uri = assembler.buildUri(context, "acme2", params);
+        Assertions.assertEquals("acme2:bar/moes:4444?amount=123&verbose=true", uri);
+    }
+
+    @Test
+    public void testCustomAssembleComplexNoPath() throws Exception {
+        EndpointUriAssembler assembler = new MySecondAssembler();
+
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("name", "bar");
+        params.put("port", "4444");
+        params.put("verbose", true);
+        params.put("amount", "123");
+
+        String uri = assembler.buildUri(context, "acme2", params);
+        Assertions.assertEquals("acme2:bar:4444?amount=123&verbose=true", uri);
+    }
+
+    @Test
+    public void testCustomAssembleComplexNoPathNoPort() throws Exception {
+        EndpointUriAssembler assembler = new MySecondAssembler();
+
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("name", "bar");
+        params.put("verbose", true);
+        params.put("amount", "123");
+
+        String uri = assembler.buildUri(context, "acme2", params);
+        Assertions.assertEquals("acme2:bar:8080?amount=123&verbose=true", uri);
     }
 
     private class MyAssembler extends EndpointUriAssemblerSupport implements EndpointUriAssembler {
 
-        private static final String SYNTAX = "timer:timerName";
+        private static final String SYNTAX = "acme:name:port";
 
         @Override
         public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters)
@@ -66,10 +154,31 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
             // begin from syntax
             String uri = SYNTAX;
 
-            // TODO: optional path parameters that are missing
+            // append path parameters
+            uri = buildPathParameter(camelContext, SYNTAX, uri, "name", null, true, parameters);
+            uri = buildPathParameter(camelContext, SYNTAX, uri, "port", 8080, false, parameters);
+            // append remainder parameters
+            uri = buildQueryParameters(camelContext, uri, parameters);
+
+            return uri;
+        }
+
+    }
+
+    private class MySecondAssembler extends EndpointUriAssemblerSupport implements EndpointUriAssembler {
+
+        private static final String SYNTAX = "acme2:name/path:port";
+
+        @Override
+        public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters)
+                throws URISyntaxException {
+            // begin from syntax
+            String uri = SYNTAX;
 
             // append path parameters
-            uri = buildPathParameter(camelContext, SYNTAX, uri, "timerName", null, true, parameters);
+            uri = buildPathParameter(camelContext, SYNTAX, uri, "name", null, true, parameters);
+            uri = buildPathParameter(camelContext, SYNTAX, uri, "path", null, false, parameters);
+            uri = buildPathParameter(camelContext, SYNTAX, uri, "port", 8080, false, parameters);
             // append remainder parameters
             uri = buildQueryParameters(camelContext, uri, parameters);
 
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
index 14a8aa0..d3e1c8c 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
@@ -44,6 +44,19 @@ public abstract class EndpointUriAssemblerSupport {
         if (ObjectHelper.isNotEmpty(obj)) {
             String str = camelContext.getTypeConverter().convertTo(String.class, obj);
             uri = uri.replace(name, str);
+        } else {
+            // the option is optional and we have no default or value for it, so we need to remove it from the syntax
+            int pos = uri.indexOf(name);
+            if (pos != -1) {
+                // remove from syntax
+                uri = uri.replace(name, "");
+                pos = pos - 1;
+                // remove the separator char
+                char ch = uri.charAt(pos);
+                if (!Character.isLetterOrDigit(ch)) {
+                    uri = uri.substring(0, pos) + uri.substring(pos + 1);
+                }
+            }
         }
         return uri;
     }


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

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

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

commit 07b9d7f96df2e53359642f6bce96bec0819817ca
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 09:44:17 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../component/ahc/AhcEndpointUriAssembler.java     | 12 ++++++---
 .../org/apache/camel/spi/EndpointUriAssembler.java |  2 +-
 .../camel/impl/engine/AbstractCamelContext.java    |  3 +--
 .../impl/CamelCatalogEndpointUriAssembler.java     |  7 +++--
 .../catalog/CustomEndpointUriAssemblerTest.java    | 11 ++++----
 ...untimeCamelCatalogEndpointUriAssemblerTest.java |  4 +--
 .../component/EndpointUriAssemblerSupport.java     | 21 +++++++++------
 .../packaging/EndpointUriAssemblerGenerator.java   | 31 ++++++++++------------
 .../GenerateUriEndpointAssemblerMojo.java          |  8 +++---
 9 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
index 751a18a..3e3d8ae 100644
--- a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
+++ b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
@@ -6,17 +6,21 @@ import java.util.Map;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
-import org.apache.camel.component.ahc.AhcComponent;
 
 /**
  * Generated by camel build tools - do NOT edit this file!
  */
-@SuppressWarnings("unchecked")
 public class AhcEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
 
+    private static final String SYNTAX = "ahc:httpUri";
+
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) throws URISyntaxException {
-        return null;
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String uri = SYNTAX;
+
+        uri = buildPathParameter(camelContext, SYNTAX, uri, "httpUri", null, true, parameters);
+        uri = buildQueryParameters(camelContext, uri, parameters);
+        return uri;
     }
 }
 
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
index 27ba83f..c1ed600 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUriAssembler.java
@@ -36,6 +36,6 @@ public interface EndpointUriAssembler {
      * @param  parameters   endpoint options
      * @return              the constructed endpoint uri
      */
-    String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) throws URISyntaxException;
+    String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException;
 
 }
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index cdab0f2..dd810cb 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -4243,8 +4243,7 @@ public abstract class AbstractCamelContext extends BaseService
         return new BaseServiceResolver<>(RuntimeCamelCatalog.ENDPOINT_URI_ASSEMBLER_FACTORY, EndpointUriAssembler.class)
                 .resolve(getCamelContextReference())
                 .orElseThrow(() -> new IllegalArgumentException(
-                        "Cannot find RuntimeCamelCatalog on classpath. "
-                                                                + "Add camel-core-catalog to classpath."));
+                        "Cannot find RuntimeCamelCatalog on classpath. Add camel-core-catalog to classpath."));
     }
 
     public enum Initialization {
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java
index 153671e..7245b8d 100644
--- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java
+++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/CamelCatalogEndpointUriAssembler.java
@@ -1,6 +1,7 @@
 package org.apache.camel.catalog.impl;
 
 import java.net.URISyntaxException;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -19,9 +20,11 @@ import static org.apache.camel.catalog.RuntimeCamelCatalog.ENDPOINT_URI_ASSEMBLE
 public class CamelCatalogEndpointUriAssembler implements EndpointUriAssembler {
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) {
+    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) {
         try {
-            return camelContext.adapt(ExtendedCamelContext.class).getRuntimeCamelCatalog().asEndpointUri(scheme, parameters,
+            Map<String, String> copy = new LinkedHashMap<>();
+            parameters.forEach((k, v) -> copy.put(k, v != null ? v.toString() : null));
+            return camelContext.adapt(ExtendedCamelContext.class).getRuntimeCamelCatalog().asEndpointUri(scheme, copy,
                     false);
         } catch (URISyntaxException e) {
             throw RuntimeCamelException.wrapRuntimeException(e);
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
index e92fe0d..f5097da 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/CustomEndpointUriAssemblerTest.java
@@ -34,9 +34,9 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
     public void testCustomAssemble() throws Exception {
         EndpointUriAssembler assembler = new MyAssembler();
 
-        Map<String, String> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
         params.put("timerName", "foo");
-        params.put("period", "123");
+        params.put("period", 123);
         params.put("repeatCount", "5");
 
         String uri = assembler.buildUri(context, "timer", params);
@@ -47,9 +47,9 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
     public void testCustomAssembleUnsorted() throws Exception {
         EndpointUriAssembler assembler = new MyAssembler();
 
-        Map<String, String> params = new LinkedHashMap<>();
+        Map<String, Object> params = new LinkedHashMap<>();
         params.put("timerName", "foo");
-        params.put("repeatCount", "5");
+        params.put("repeatCount", 5);
         params.put("period", "123");
 
         String uri = assembler.buildUri(context, "timer", params);
@@ -61,7 +61,8 @@ public class CustomEndpointUriAssemblerTest extends ContextTestSupport {
         private static final String SYNTAX = "timer:timerName";
 
         @Override
-        public String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) throws URISyntaxException {
+        public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters)
+                throws URISyntaxException {
             // begin from syntax
             String uri = SYNTAX;
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
index fbf620b..a3cf85b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/catalog/RuntimeCamelCatalogEndpointUriAssemblerTest.java
@@ -32,7 +32,7 @@ public class RuntimeCamelCatalogEndpointUriAssemblerTest extends ContextTestSupp
     public void testLookupAssemble() throws Exception {
         EndpointUriAssembler assembler = context.adapt(ExtendedCamelContext.class).getEndpointUriAssembler("timer");
 
-        Map<String, String> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
         params.put("timerName", "foo");
         params.put("period", "123");
         params.put("repeatCount", "5");
@@ -45,7 +45,7 @@ public class RuntimeCamelCatalogEndpointUriAssemblerTest extends ContextTestSupp
     public void testRuntimeAssemble() throws Exception {
         EndpointUriAssembler assembler = new CamelCatalogEndpointUriAssembler();
 
-        Map<String, String> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
         params.put("timerName", "foo");
         params.put("period", "123");
         params.put("repeatCount", "5");
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
index b74fbae..14a8aa0 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
@@ -30,23 +30,28 @@ import org.apache.camel.util.URISupport;
  */
 public abstract class EndpointUriAssemblerSupport {
 
-    protected String buildPathParameter(CamelContext camelContext, String syntax, String uri, String name, String defaultValue, boolean required, Map<String, String> parameters) {
-        String obj = parameters.remove(name);
-        if (ObjectHelper.isEmpty(obj)) {
-            obj = defaultValue;
+    protected String buildPathParameter(
+            CamelContext camelContext, String syntax, String uri, String name, Object defaultValue, boolean required,
+            Map<String, Object> parameters) {
+        Object obj = parameters.remove(name);
+        if (ObjectHelper.isEmpty(obj) && defaultValue != null) {
+            obj = camelContext.getTypeConverter().convertTo(String.class, defaultValue);
         }
         if (ObjectHelper.isEmpty(obj) && required) {
-            throw new IllegalArgumentException("Option " + name + " is required when creating endpoint uri with syntax " + syntax);
+            throw new IllegalArgumentException(
+                    "Option " + name + " is required when creating endpoint uri with syntax " + syntax);
         }
         if (ObjectHelper.isNotEmpty(obj)) {
-            uri = uri.replace(name, obj);
+            String str = camelContext.getTypeConverter().convertTo(String.class, obj);
+            uri = uri.replace(name, str);
         }
         return uri;
     }
 
-    protected String buildQueryParameters(CamelContext camelContext, String uri, Map<String, String> parameters) throws URISyntaxException {
+    protected String buildQueryParameters(CamelContext camelContext, String uri, Map<String, Object> parameters)
+            throws URISyntaxException {
         // we want sorted parameters
-        Map map = new TreeMap(parameters);
+        Map<String, Object> map = new TreeMap<>(parameters);
         String query = URISupport.createQueryString(map);
         if (ObjectHelper.isNotEmpty(query)) {
             uri = uri + "?" + query;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
index c097e03..01b2e38 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
@@ -18,11 +18,9 @@ package org.apache.camel.maven.packaging;
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.stream.Collectors;
 
 import org.apache.camel.tooling.model.BaseOptionModel;
+import org.apache.camel.tooling.model.ComponentModel;
 
 public final class EndpointUriAssemblerGenerator {
 
@@ -31,8 +29,7 @@ public final class EndpointUriAssemblerGenerator {
 
     public static void generateEndpointUriAssembler(
             String pn, String cn, String en,
-            String pfqn, String psn,
-            Collection<? extends BaseOptionModel> options, Writer w)
+            String pfqn, String psn, ComponentModel model, Writer w)
             throws IOException {
 
         w.write("/* " + AbstractGeneratorMojo.GENERATED_MSG + " */\n");
@@ -43,25 +40,25 @@ public final class EndpointUriAssemblerGenerator {
         w.write("\n");
         w.write("import org.apache.camel.CamelContext;\n");
         w.write("import org.apache.camel.spi.EndpointUriAssembler;\n");
-        w.write("import " + pfqn + ";\n");
         w.write("\n");
         w.write("/**\n");
         w.write(" * " + AbstractGeneratorMojo.GENERATED_MSG + "\n");
         w.write(" */\n");
-        w.write("@SuppressWarnings(\"unchecked\")\n");
-        w.write("public class " + cn + " extends " + psn
-                + " implements EndpointUriAssembler {\n");
-
-        // sort options A..Z so they always have same order
-        options = options.stream().sorted(Comparator.comparing(BaseOptionModel::getName)).collect(Collectors.toList());
-
-        // generate API that returns all the options
+        w.write("public class " + cn + " extends " + psn + " implements EndpointUriAssembler {\n");
+        w.write("\n");
+        w.write("    private static final String SYNTAX = \"" + model.getSyntax() + "\";\n");
         w.write("\n");
         w.write("    @Override\n");
-        w.write("    public String buildUri(CamelContext camelContext, String scheme, Map<String, String> parameters) throws URISyntaxException {\n");
-        w.write("        return null;\n");
+        w.write("    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {\n");
+        w.write("        String uri = SYNTAX;\n");
+        w.write("\n");
+        for (BaseOptionModel option : model.getEndpointPathOptions()) {
+            w.write("        uri = buildPathParameter(camelContext, SYNTAX, uri, \"" + option.getName() + "\", "
+                    + option.getDefaultValue() + ", " + option.isRequired() + ", parameters);\n");
+        }
+        w.write("        uri = buildQueryParameters(camelContext, uri, parameters);\n");
+        w.write("        return uri;\n");
         w.write("    }\n");
-
         w.write("}\n");
         w.write("\n");
     }
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateUriEndpointAssemblerMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateUriEndpointAssemblerMojo.java
index 431f2d7..f6d0301 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateUriEndpointAssemblerMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateUriEndpointAssemblerMojo.java
@@ -128,10 +128,10 @@ public class GenerateUriEndpointAssemblerMojo extends AbstractGeneratorMojo {
     }
 
     protected void createEndpointUrlAssembler(ComponentModel model) throws IOException {
-        getLog().info("Generating endpoint-uri-assembler: " + model.getScheme());
+        getLog().debug("Generating endpoint-uri-assembler: " + model.getScheme());
 
         String fqn = model.getJavaType();
-        generateEndpointUriAssembler(fqn, fqn, model.getEndpointOptions(), sourcesOutputDir);
+        generateEndpointUriAssembler(fqn, fqn, model, sourcesOutputDir);
 
         int pos = fqn.lastIndexOf('.');
         String pn = fqn.substring(0, pos);
@@ -159,7 +159,7 @@ public class GenerateUriEndpointAssemblerMojo extends AbstractGeneratorMojo {
 
     @Deprecated
     private void generateEndpointUriAssembler(
-            String fqn, String targetFqn, List<ComponentModel.EndpointOptionModel> options, File outputDir)
+            String fqn, String targetFqn, ComponentModel model, File outputDir)
             throws IOException {
 
         int pos = targetFqn.lastIndexOf('.');
@@ -172,7 +172,7 @@ public class GenerateUriEndpointAssemblerMojo extends AbstractGeneratorMojo {
         String psn = "org.apache.camel.support.component.EndpointUriAssemblerSupport";
 
         StringWriter sw = new StringWriter();
-        EndpointUriAssemblerGenerator.generateEndpointUriAssembler(pn, cn, en, pfqn, psn, options, sw);
+        EndpointUriAssemblerGenerator.generateEndpointUriAssembler(pn, cn, en, pfqn, psn, model, sw);
 
         String source = sw.toString();
 


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

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

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

commit 3ee633a22252aef2f009b7d726cc06aa322f004a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 14:05:37 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../activemq/ActiveMQEndpointUriAssembler.java     |  9 ++-
 .../component/ahc/ws/WsEndpointUriAssembler.java   |  7 +-
 .../component/ahc/AhcEndpointUriAssembler.java     |  7 +-
 .../component/amqp/AMQPEndpointUriAssembler.java   |  9 ++-
 .../component/apns/ApnsEndpointUriAssembler.java   |  7 +-
 .../arangodb/ArangoDbEndpointUriAssembler.java     |  7 +-
 .../component/as2/AS2EndpointUriAssembler.java     |  9 ++-
 .../asterisk/AsteriskEndpointUriAssembler.java     |  7 +-
 .../component/atmos/AtmosEndpointUriAssembler.java |  9 ++-
 .../websocket/WebsocketEndpointUriAssembler.java   |  7 +-
 .../component/atom/AtomEndpointUriAssembler.java   |  7 +-
 .../client/map/AtomixMapEndpointUriAssembler.java  |  7 +-
 .../AtomixMessagingEndpointUriAssembler.java       |  7 +-
 .../AtomixMultiMapEndpointUriAssembler.java        |  7 +-
 .../queue/AtomixQueueEndpointUriAssembler.java     |  7 +-
 .../client/set/AtomixSetEndpointUriAssembler.java  |  7 +-
 .../value/AtomixValueEndpointUriAssembler.java     |  7 +-
 .../component/avro/AvroEndpointUriAssembler.java   | 13 ++--
 .../component/aws/cw/CwEndpointUriAssembler.java   |  7 +-
 .../component/aws/ddb/DdbEndpointUriAssembler.java |  7 +-
 .../ddbstream/DdbStreamEndpointUriAssembler.java   |  7 +-
 .../component/aws/ec2/EC2EndpointUriAssembler.java |  7 +-
 .../component/aws/ecs/ECSEndpointUriAssembler.java |  7 +-
 .../component/aws/eks/EKSEndpointUriAssembler.java |  7 +-
 .../component/aws/iam/IAMEndpointUriAssembler.java |  7 +-
 .../KinesisFirehoseEndpointUriAssembler.java       |  7 +-
 .../aws/kinesis/KinesisEndpointUriAssembler.java   |  7 +-
 .../component/aws/kms/KMSEndpointUriAssembler.java |  7 +-
 .../aws/lambda/LambdaEndpointUriAssembler.java     |  7 +-
 .../component/aws/mq/MQEndpointUriAssembler.java   |  7 +-
 .../component/aws/msk/MSKEndpointUriAssembler.java |  7 +-
 .../component/aws/s3/S3EndpointUriAssembler.java   |  7 +-
 .../component/aws/sdb/SdbEndpointUriAssembler.java |  7 +-
 .../component/aws/ses/SesEndpointUriAssembler.java |  7 +-
 .../component/aws/sns/SnsEndpointUriAssembler.java |  7 +-
 .../component/aws/sqs/SqsEndpointUriAssembler.java |  7 +-
 .../component/aws/swf/SWFEndpointUriAssembler.java |  7 +-
 .../translate/TranslateEndpointUriAssembler.java   |  7 +-
 .../aws2/athena/Athena2EndpointUriAssembler.java   |  7 +-
 .../component/aws2/cw/Cw2EndpointUriAssembler.java |  7 +-
 .../aws2/ddb/Ddb2EndpointUriAssembler.java         |  7 +-
 .../ddbstream/Ddb2StreamEndpointUriAssembler.java  |  7 +-
 .../aws2/ec2/AWS2EC2EndpointUriAssembler.java      |  7 +-
 .../aws2/ecs/ECS2EndpointUriAssembler.java         |  7 +-
 .../aws2/eks/EKS2EndpointUriAssembler.java         |  7 +-
 .../EventbridgeEndpointUriAssembler.java           |  7 +-
 .../aws2/iam/IAM2EndpointUriAssembler.java         |  7 +-
 .../KinesisFirehose2EndpointUriAssembler.java      |  7 +-
 .../aws2/kinesis/Kinesis2EndpointUriAssembler.java |  7 +-
 .../aws2/kms/KMS2EndpointUriAssembler.java         |  7 +-
 .../aws2/lambda/Lambda2EndpointUriAssembler.java   |  7 +-
 .../component/aws2/mq/MQ2EndpointUriAssembler.java |  7 +-
 .../aws2/msk/MSK2EndpointUriAssembler.java         |  7 +-
 .../aws2/s3/AWS2S3EndpointUriAssembler.java        |  7 +-
 .../aws2/ses/Ses2EndpointUriAssembler.java         |  7 +-
 .../aws2/sns/Sns2EndpointUriAssembler.java         |  7 +-
 .../aws2/sqs/Sqs2EndpointUriAssembler.java         |  7 +-
 .../aws2/sts/STS2EndpointUriAssembler.java         |  7 +-
 .../translate/Translate2EndpointUriAssembler.java  |  7 +-
 .../eventhubs/EventHubsEndpointUriAssembler.java   |  9 ++-
 .../storage/blob/BlobEndpointUriAssembler.java     |  9 ++-
 .../storage/queue/QueueEndpointUriAssembler.java   |  9 ++-
 .../blob/BlobServiceEndpointUriAssembler.java      |  7 +-
 .../queue/QueueServiceEndpointUriAssembler.java    |  7 +-
 .../BeanValidatorEndpointUriAssembler.java         |  7 +-
 .../component/bean/BeanEndpointUriAssembler.java   |  7 +-
 .../beanclass/ClassEndpointUriAssembler.java       |  7 +-
 .../beanstalk/BeanstalkEndpointUriAssembler.java   |  7 +-
 .../bonita/BonitaEndpointUriAssembler.java         |  7 +-
 .../component/box/BoxEndpointUriAssembler.java     |  9 ++-
 .../braintree/BraintreeEndpointUriAssembler.java   |  9 ++-
 .../browse/BrowseEndpointUriAssembler.java         |  7 +-
 .../cache/CaffeineCacheEndpointUriAssembler.java   |  7 +-
 .../CaffeineLoadCacheEndpointUriAssembler.java     |  7 +-
 .../cassandra/CassandraEndpointUriAssembler.java   | 13 ++--
 .../chatscript/ChatScriptEndpointUriAssembler.java | 11 ++--
 .../component/chunk/ChunkEndpointUriAssembler.java |  7 +-
 .../camel/component/cm/CMEndpointUriAssembler.java |  7 +-
 .../component/cmis/CMISEndpointUriAssembler.java   |  7 +-
 .../camel/coap/CoAPEndpointUriAssembler.java       |  7 +-
 .../cometd/CometdEndpointUriAssembler.java         | 11 ++--
 .../consul/ConsulEndpointUriAssembler.java         |  7 +-
 .../controlbus/ControlBusEndpointUriAssembler.java |  9 ++-
 .../component/corda/CordaEndpointUriAssembler.java |  7 +-
 .../couchbase/CouchbaseEndpointUriAssembler.java   | 11 ++--
 .../couchdb/CouchDbEndpointUriAssembler.java       | 13 ++--
 .../component/cron/CronEndpointUriAssembler.java   |  7 +-
 .../crypto/cms/CryptoCmsEndpointUriAssembler.java  |  9 ++-
 .../DigitalSignatureEndpointUriAssembler.java      |  9 ++-
 .../component/cxf/CxfEndpointUriAssembler.java     |  9 ++-
 .../cxf/jaxrs/CxfRsEndpointUriAssembler.java       |  9 ++-
 .../dataformat/DataFormatEndpointUriAssembler.java |  9 ++-
 .../dataset/DataSetEndpointUriAssembler.java       |  7 +-
 .../dataset/DataSetTestEndpointUriAssembler.java   |  7 +-
 .../DebeziumMongodbEndpointUriAssembler.java       |  7 +-
 .../DebeziumMySqlEndpointUriAssembler.java         |  7 +-
 .../DebeziumPostgresEndpointUriAssembler.java      |  7 +-
 .../DebeziumSqlserverEndpointUriAssembler.java     |  7 +-
 .../DigitalOceanEndpointUriAssembler.java          |  7 +-
 .../direct/DirectEndpointUriAssembler.java         |  7 +-
 .../directvm/DirectVmEndpointUriAssembler.java     |  7 +-
 .../disruptor/DisruptorEndpointUriAssembler.java   |  7 +-
 .../vm/DisruptorVmEndpointUriAssembler.java        |  7 +-
 .../component/djl/DJLEndpointUriAssembler.java     |  7 +-
 .../component/dns/DnsEndpointUriAssembler.java     |  7 +-
 .../docker/DockerEndpointUriAssembler.java         |  7 +-
 .../component/dozer/DozerEndpointUriAssembler.java |  7 +-
 .../component/drill/DrillEndpointUriAssembler.java |  7 +-
 .../dropbox/DropboxEndpointUriAssembler.java       |  7 +-
 .../ehcache/EhcacheEndpointUriAssembler.java       |  7 +-
 .../ElasticsearchEndpointUriAssembler.java         |  7 +-
 .../component/elsql/ElsqlEndpointUriAssembler.java |  9 ++-
 .../etcd/EtcdKeysEndpointUriAssembler.java         |  7 +-
 .../etcd/EtcdStatsEndpointUriAssembler.java        |  7 +-
 .../etcd/EtcdWatchEndpointUriAssembler.java        |  7 +-
 .../component/exec/ExecEndpointUriAssembler.java   |  7 +-
 .../facebook/FacebookEndpointUriAssembler.java     |  7 +-
 .../component/fhir/FhirEndpointUriAssembler.java   |  9 ++-
 .../file/watch/FileWatchEndpointUriAssembler.java  |  7 +-
 .../component/file/FileEndpointUriAssembler.java   |  7 +-
 .../flatpack/FlatpackEndpointUriAssembler.java     |  9 ++-
 .../component/flink/FlinkEndpointUriAssembler.java |  7 +-
 .../component/fop/FopEndpointUriAssembler.java     |  7 +-
 .../freemarker/FreemarkerEndpointUriAssembler.java |  7 +-
 .../file/remote/FtpEndpointUriAssembler.java       | 11 ++--
 .../file/remote/FtpsEndpointUriAssembler.java      | 11 ++--
 .../file/remote/SftpEndpointUriAssembler.java      | 11 ++--
 .../ganglia/GangliaEndpointUriAssembler.java       |  9 ++-
 .../geocoder/GeoCoderEndpointUriAssembler.java     |  9 ++-
 .../component/git/GitEndpointUriAssembler.java     |  7 +-
 .../github/GitHubEndpointUriAssembler.java         |  9 ++-
 .../GoogleBigQueryEndpointUriAssembler.java        | 11 ++--
 .../sql/GoogleBigQuerySQLEndpointUriAssembler.java |  9 ++-
 .../GoogleCalendarEndpointUriAssembler.java        |  9 ++-
 .../GoogleCalendarStreamEndpointUriAssembler.java  |  7 +-
 .../drive/GoogleDriveEndpointUriAssembler.java     |  9 ++-
 .../mail/GoogleMailEndpointUriAssembler.java       |  9 ++-
 .../GoogleMailStreamEndpointUriAssembler.java      |  7 +-
 .../pubsub/GooglePubsubEndpointUriAssembler.java   |  9 ++-
 .../sheets/GoogleSheetsEndpointUriAssembler.java   |  9 ++-
 .../GoogleSheetsStreamEndpointUriAssembler.java    |  7 +-
 .../component/gora/GoraEndpointUriAssembler.java   |  7 +-
 .../component/grape/GrapeEndpointUriAssembler.java |  7 +-
 .../graphql/GraphqlEndpointUriAssembler.java       |  7 +-
 .../component/grpc/GrpcEndpointUriAssembler.java   | 11 ++--
 .../GuavaEventBusEndpointUriAssembler.java         |  7 +-
 .../HazelcastAtomicnumberEndpointUriAssembler.java |  7 +-
 .../HazelcastInstanceEndpointUriAssembler.java     |  7 +-
 .../list/HazelcastListEndpointUriAssembler.java    |  7 +-
 .../map/HazelcastMapEndpointUriAssembler.java      |  7 +-
 .../HazelcastMultimapEndpointUriAssembler.java     |  7 +-
 .../queue/HazelcastQueueEndpointUriAssembler.java  |  7 +-
 ...HazelcastReplicatedmapEndpointUriAssembler.java |  7 +-
 .../HazelcastRingbufferEndpointUriAssembler.java   |  7 +-
 .../seda/HazelcastSedaEndpointUriAssembler.java    |  7 +-
 .../set/HazelcastSetEndpointUriAssembler.java      |  7 +-
 .../topic/HazelcastTopicEndpointUriAssembler.java  |  7 +-
 .../component/hbase/HBaseEndpointUriAssembler.java |  7 +-
 .../component/hdfs/HdfsEndpointUriAssembler.java   | 11 ++--
 .../hipchat/HipchatEndpointUriAssembler.java       | 11 ++--
 .../component/http/HttpEndpointUriAssembler.java   |  7 +-
 .../client/ClientEndpointUriAssembler.java         |  7 +-
 .../server/ServerEndpointUriAssembler.java         |  7 +-
 .../infinispan/InfinispanEndpointUriAssembler.java |  7 +-
 .../influxdb/InfluxDbEndpointUriAssembler.java     |  7 +-
 .../component/iota/IOTAEndpointUriAssembler.java   |  7 +-
 .../component/ipfs/IPFSEndpointUriAssembler.java   |  7 +-
 .../component/irc/IrcEndpointUriAssembler.java     |  9 ++-
 .../ironmq/IronMQEndpointUriAssembler.java         |  7 +-
 .../component/jbpm/JBPMEndpointUriAssembler.java   |  9 ++-
 .../jcache/JCacheEndpointUriAssembler.java         |  7 +-
 .../jclouds/JcloudsEndpointUriAssembler.java       |  9 ++-
 .../component/jcr/JcrEndpointUriAssembler.java     |  9 ++-
 .../component/jdbc/JdbcEndpointUriAssembler.java   |  7 +-
 .../jetty9/JettyHttp9EndpointUriAssembler.java     |  7 +-
 .../raft/JGroupsRaftEndpointUriAssembler.java      |  7 +-
 .../jgroups/JGroupsEndpointUriAssembler.java       |  7 +-
 .../validator/jing/JingEndpointUriAssembler.java   |  7 +-
 .../component/jira/JiraEndpointUriAssembler.java   |  7 +-
 .../component/jms/JmsEndpointUriAssembler.java     |  9 ++-
 .../component/jmx/JMXEndpointUriAssembler.java     |  7 +-
 .../component/jolt/JoltEndpointUriAssembler.java   |  7 +-
 .../component/jooq/JooqEndpointUriAssembler.java   |  7 +-
 .../component/jpa/JpaEndpointUriAssembler.java     |  7 +-
 .../component/scp/ScpEndpointUriAssembler.java     | 11 ++--
 .../component/jslt/JsltEndpointUriAssembler.java   |  7 +-
 .../JsonValidatorEndpointUriAssembler.java         |  7 +-
 .../jsonata/JsonataEndpointUriAssembler.java       |  7 +-
 .../component/jt400/Jt400EndpointUriAssembler.java | 15 +++--
 .../component/kafka/KafkaEndpointUriAssembler.java |  7 +-
 .../KubernetesConfigMapsEndpointUriAssembler.java  |  7 +-
 .../KubernetesDeploymentsEndpointUriAssembler.java |  7 +-
 .../hpa/KubernetesHPAEndpointUriAssembler.java     |  7 +-
 .../job/KubernetesJobEndpointUriAssembler.java     |  7 +-
 .../KubernetesNamespacesEndpointUriAssembler.java  |  7 +-
 .../nodes/KubernetesNodesEndpointUriAssembler.java |  7 +-
 ...netesPersistentVolumesEndpointUriAssembler.java |  7 +-
 ...ersistentVolumesClaimsEndpointUriAssembler.java |  7 +-
 .../pods/KubernetesPodsEndpointUriAssembler.java   |  7 +-
 ...ReplicationControllersEndpointUriAssembler.java |  7 +-
 ...bernetesResourcesQuotaEndpointUriAssembler.java |  7 +-
 .../KubernetesSecretsEndpointUriAssembler.java     |  7 +-
 ...ernetesServiceAccountsEndpointUriAssembler.java |  7 +-
 .../KubernetesServicesEndpointUriAssembler.java    |  7 +-
 .../OpenshiftBuildConfigsEndpointUriAssembler.java |  7 +-
 .../OpenshiftBuildsEndpointUriAssembler.java       |  7 +-
 .../component/kudu/KuduEndpointUriAssembler.java   | 11 ++--
 .../language/LanguageEndpointUriAssembler.java     |  9 ++-
 .../component/ldap/LdapEndpointUriAssembler.java   |  7 +-
 .../component/ldif/LdifEndpointUriAssembler.java   |  7 +-
 .../component/log/LogEndpointUriAssembler.java     |  7 +-
 .../lucene/LuceneEndpointUriAssembler.java         |  9 ++-
 .../lumberjack/LumberjackEndpointUriAssembler.java |  9 ++-
 .../component/mail/MailEndpointUriAssembler.java   |  9 ++-
 .../master/MasterEndpointUriAssembler.java         |  9 ++-
 .../metrics/MetricsEndpointUriAssembler.java       |  9 ++-
 .../micrometer/MicrometerEndpointUriAssembler.java | 11 ++--
 .../MicroProfileMetricsEndpointUriAssembler.java   |  9 ++-
 .../client/MiloClientEndpointUriAssembler.java     |  7 +-
 .../server/MiloServerEndpointUriAssembler.java     |  7 +-
 .../component/mina/MinaEndpointUriAssembler.java   | 11 ++--
 .../component/minio/MinioEndpointUriAssembler.java |  7 +-
 .../component/mllp/MllpEndpointUriAssembler.java   |  9 ++-
 .../component/mock/MockEndpointUriAssembler.java   |  7 +-
 .../mongodb/gridfs/GridFsEndpointUriAssembler.java |  7 +-
 .../mongodb/MongoDbEndpointUriAssembler.java       |  7 +-
 .../validator/msv/MsvEndpointUriAssembler.java     |  7 +-
 .../mustache/MustacheEndpointUriAssembler.java     |  7 +-
 .../component/mvel/MvelEndpointUriAssembler.java   |  7 +-
 .../mybatis/MyBatisBeanEndpointUriAssembler.java   |  9 ++-
 .../mybatis/MyBatisEndpointUriAssembler.java       |  7 +-
 .../nagios/NagiosEndpointUriAssembler.java         |  9 ++-
 .../component/nats/NatsEndpointUriAssembler.java   |  7 +-
 .../netty/http/NettyHttpEndpointUriAssembler.java  | 13 ++--
 .../http/NettyHttpEndpointUriAssemblerTest.java    | 77 ++++++++++++++++++++++
 .../component/netty/NettyEndpointUriAssembler.java | 11 ++--
 .../nitrite/NitriteEndpointUriAssembler.java       |  7 +-
 .../component/nsq/NsqEndpointUriAssembler.java     |  7 +-
 .../component/OAIPMHEndpointUriAssembler.java      |  7 +-
 .../olingo2/Olingo2EndpointUriAssembler.java       |  9 ++-
 .../olingo4/Olingo4EndpointUriAssembler.java       |  9 ++-
 .../cinder/CinderEndpointUriAssembler.java         |  7 +-
 .../glance/GlanceEndpointUriAssembler.java         |  7 +-
 .../keystone/KeystoneEndpointUriAssembler.java     |  7 +-
 .../neutron/NeutronEndpointUriAssembler.java       |  7 +-
 .../openstack/nova/NovaEndpointUriAssembler.java   |  7 +-
 .../openstack/swift/SwiftEndpointUriAssembler.java |  7 +-
 .../OptaPlannerEndpointUriAssembler.java           |  7 +-
 .../component/paho/PahoEndpointUriAssembler.java   |  7 +-
 .../component/pdf/PdfEndpointUriAssembler.java     |  7 +-
 .../PgReplicationSlotEndpointUriAssembler.java     | 15 +++--
 .../pgevent/PgEventEndpointUriAssembler.java       | 13 ++--
 .../http/PlatformHttpEndpointUriAssembler.java     |  7 +-
 .../printer/PrinterEndpointUriAssembler.java       | 11 ++--
 .../pubnub/PubNubEndpointUriAssembler.java         |  7 +-
 .../pulsar/PulsarEndpointUriAssembler.java         | 13 ++--
 .../quartz/QuartzEndpointUriAssembler.java         |  9 ++-
 .../quickfixj/QuickfixjEndpointUriAssembler.java   |  7 +-
 .../rabbitmq/RabbitMQEndpointUriAssembler.java     |  7 +-
 .../ReactiveStreamsEndpointUriAssembler.java       |  7 +-
 .../component/ref/RefEndpointUriAssembler.java     |  7 +-
 .../openapi/RestOpenApiEndpointUriAssembler.java   |  9 ++-
 .../swagger/RestSwaggerEndpointUriAssembler.java   |  9 ++-
 .../rest/RestApiEndpointUriAssembler.java          |  9 ++-
 .../component/rest/RestEndpointUriAssembler.java   | 11 ++--
 .../resteasy/ResteasyEndpointUriAssembler.java     |  7 +-
 .../RobotFrameworkEndpointUriAssembler.java        |  7 +-
 .../component/rss/RssEndpointUriAssembler.java     |  7 +-
 .../component/saga/SagaEndpointUriAssembler.java   |  7 +-
 .../salesforce/SalesforceEndpointUriAssembler.java |  9 ++-
 .../netweaver/NetWeaverEndpointUriAssembler.java   |  7 +-
 .../xquery/XQueryEndpointUriAssembler.java         |  7 +-
 .../scheduler/SchedulerEndpointUriAssembler.java   |  7 +-
 .../schematron/SchematronEndpointUriAssembler.java |  7 +-
 .../component/seda/SedaEndpointUriAssembler.java   |  7 +-
 .../service/ServiceEndpointUriAssembler.java       |  7 +-
 .../servicenow/ServiceNowEndpointUriAssembler.java |  7 +-
 .../servlet/ServletEndpointUriAssembler.java       |  7 +-
 .../component/sip/SipEndpointUriAssembler.java     |  7 +-
 .../component/sjms/SjmsEndpointUriAssembler.java   |  9 ++-
 .../sjms/batch/SjmsBatchEndpointUriAssembler.java  |  7 +-
 .../component/sjms2/Sjms2EndpointUriAssembler.java |  9 ++-
 .../component/slack/SlackEndpointUriAssembler.java |  7 +-
 .../component/smpp/SmppEndpointUriAssembler.java   |  9 ++-
 .../component/snmp/SnmpEndpointUriAssembler.java   |  9 ++-
 .../component/solr/SolrEndpointUriAssembler.java   |  7 +-
 .../component/SoroushBotEndpointUriAssembler.java  |  7 +-
 .../component/spark/SparkEndpointUriAssembler.java |  7 +-
 .../splunkhec/SplunkHECEndpointUriAssembler.java   |  9 ++-
 .../splunk/SplunkEndpointUriAssembler.java         |  7 +-
 .../batch/SpringBatchEndpointUriAssembler.java     |  7 +-
 .../SpringIntegrationEndpointUriAssembler.java     |  7 +-
 .../springldap/SpringLdapEndpointUriAssembler.java |  7 +-
 .../component/redis/RedisEndpointUriAssembler.java |  9 ++-
 .../ws/SpringWebserviceEndpointUriAssembler.java   | 13 ++--
 .../component/event/EventEndpointUriAssembler.java |  7 +-
 .../component/sql/SqlEndpointUriAssembler.java     |  7 +-
 .../sql/stored/SqlStoredEndpointUriAssembler.java  |  7 +-
 .../component/ssh/SshEndpointUriAssembler.java     |  9 ++-
 .../component/stax/StAXEndpointUriAssembler.java   |  7 +-
 .../component/stomp/StompEndpointUriAssembler.java |  7 +-
 .../stream/StreamEndpointUriAssembler.java         |  7 +-
 .../StringTemplateEndpointUriAssembler.java        |  7 +-
 .../component/stub/StubEndpointUriAssembler.java   |  7 +-
 .../telegram/TelegramEndpointUriAssembler.java     |  7 +-
 .../thrift/ThriftEndpointUriAssembler.java         | 11 ++--
 .../component/tika/TikaEndpointUriAssembler.java   |  7 +-
 .../component/timer/TimerEndpointUriAssembler.java |  7 +-
 .../twilio/TwilioEndpointUriAssembler.java         |  9 ++-
 .../TwitterDirectMessageEndpointUriAssembler.java  |  7 +-
 .../search/TwitterSearchEndpointUriAssembler.java  |  7 +-
 .../TwitterTimelineEndpointUriAssembler.java       |  7 +-
 .../undertow/UndertowEndpointUriAssembler.java     |  7 +-
 .../validator/ValidatorEndpointUriAssembler.java   |  7 +-
 .../velocity/VelocityEndpointUriAssembler.java     |  7 +-
 .../vertx/http/VertxHttpEndpointUriAssembler.java  |  7 +-
 .../VertxWebsocketEndpointUriAssembler.java        | 11 ++--
 .../component/vertx/VertxEndpointUriAssembler.java |  7 +-
 .../camel/component/vm/VmEndpointUriAssembler.java |  7 +-
 .../weather/WeatherEndpointUriAssembler.java       |  7 +-
 .../component/web3j/Web3jEndpointUriAssembler.java |  7 +-
 .../webhook/WebhookEndpointUriAssembler.java       |  7 +-
 .../JSR356WebSocketEndpointUriAssembler.java       |  7 +-
 .../websocket/WebsocketEndpointUriAssembler.java   | 11 ++--
 .../component/weka/WekaEndpointUriAssembler.java   |  7 +-
 .../wordpress/WordpressEndpointUriAssembler.java   |  9 ++-
 .../workday/WorkdayEndpointUriAssembler.java       |  9 ++-
 .../xchange/XChangeEndpointUriAssembler.java       |  7 +-
 .../camel/component/xj/XJEndpointUriAssembler.java |  7 +-
 .../xmlsecurity/XmlSignerEndpointUriAssembler.java |  7 +-
 .../XmlVerifierEndpointUriAssembler.java           |  7 +-
 .../component/xmpp/XmppEndpointUriAssembler.java   | 11 ++--
 .../xslt/saxon/XsltSaxonEndpointUriAssembler.java  |  7 +-
 .../component/xslt/XsltEndpointUriAssembler.java   |  7 +-
 .../yammer/YammerEndpointUriAssembler.java         |  7 +-
 .../zendesk/ZendeskEndpointUriAssembler.java       |  7 +-
 .../MasterEndpointUriAssembler.java                |  9 ++-
 .../zookeeper/ZooKeeperEndpointUriAssembler.java   |  9 ++-
 .../component/EndpointUriAssemblerSupport.java     |  9 ++-
 .../packaging/EndpointUriAssemblerGenerator.java   |  7 +-
 340 files changed, 1907 insertions(+), 809 deletions(-)

diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java
index 4671bbe..cc4d7d2 100644
--- a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.activemq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class ActiveMQEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java
index 6764a7b..4f39303 100644
--- a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java
+++ b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ahc.ws;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class WsEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
index d2860d0..f1fc2f1 100644
--- a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
+++ b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ahc;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AhcEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java
index 5423476..5d55534 100644
--- a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java
+++ b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.amqp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class AMQPEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java
index d852895..e7813dd 100644
--- a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java
+++ b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.apns;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ApnsEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java
index 7edca8a..be54ee0 100644
--- a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java
+++ b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.arangodb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ArangoDbEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java
index 17c1d7b..3f19636 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.as2;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class AS2EndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java
index 4a507e0..037a116 100644
--- a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java
+++ b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.asterisk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AsteriskEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java
index 0972370..a59d0f3 100644
--- a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java
+++ b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atmos;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class AtmosEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java
index 2830237..34f4da9 100644
--- a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java
+++ b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atmosphere.websocket;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class WebsocketEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "servicePath", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "servicePath", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java
index e63cd46..9cf783a 100644
--- a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java
+++ b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atom;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "feedUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "feedUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java
index 906d060..ecb8ce6 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.map;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixMapEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java
index 870f2ec..a7d05ad 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.messaging;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixMessagingEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java
index 61fce2d..0cbe273 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.multimap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixMultiMapEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java
index c5963c0..cb9e32b 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.queue;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixQueueEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java
index 6b1c0a5..7c50246 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.set;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixSetEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java
index efede6b..4408526 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.value;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixValueEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java
index a2b7b71..34269d7 100644
--- a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java
+++ b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.avro;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class AvroEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "transport", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "messageName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "transport", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "messageName", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java
index 46c9466..c009450 100644
--- a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java
+++ b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.cw;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CwEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java
index f9a3f4b..f282dc8 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.ddb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DdbEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java
index ca84076..5d1bfe1 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.ddbstream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DdbStreamEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java
index 3d51764..4a92ad5 100644
--- a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java
+++ b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.ec2;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EC2EndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java
index b45fe74..a83dd6f 100644
--- a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java
+++ b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.ecs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ECSEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java
index c131bbe..c0baa5f 100644
--- a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java
+++ b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.eks;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EKSEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java
index a26ed2a..4eb5800 100644
--- a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java
+++ b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.iam;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class IAMEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java
index 067ede1..5a639ee 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.firehose;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KinesisFirehoseEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java
index effadeaf..784685b 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.kinesis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KinesisEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java
index 19d8e95..caef2ad 100644
--- a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java
+++ b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.kms;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KMSEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java
index ef1ac73..dc8b80d 100644
--- a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java
+++ b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.lambda;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class LambdaEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java
index bcdd8f9..aeaa610 100644
--- a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java
+++ b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.mq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MQEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java
index 1e3ad07..464b523 100644
--- a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java
+++ b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.msk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MSKEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java
index 8bc6e3b..eacb7d9 100644
--- a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java
+++ b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.s3;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class S3EndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java
index 1cf9461..fb3e745 100644
--- a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java
+++ b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.sdb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SdbEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "domainName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "domainName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java
index 80c67e3..924b4e8 100644
--- a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java
+++ b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.ses;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SesEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java
index 586c8b0..640c896 100644
--- a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java
+++ b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.sns;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SnsEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java
index 78b7b8d..f350cfd 100644
--- a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java
+++ b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.sqs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SqsEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java
index 67b88e7..8d8028b 100644
--- a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java
+++ b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.swf;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SWFEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java
index c28c78a..863cd4e 100644
--- a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java
+++ b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.translate;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TranslateEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java
index d5df9c4..0d42591 100644
--- a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java
+++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.athena;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Athena2EndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java
index 05a49f1..df65548 100644
--- a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java
+++ b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.cw;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Cw2EndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java
index b318ad9..a68bd50 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.ddb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Ddb2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java
index c45a645..406760a 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.ddbstream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Ddb2StreamEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java
index 610b691..f7037d8 100644
--- a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java
+++ b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.ec2;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AWS2EC2EndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java
index 4280abb..12ee54a 100644
--- a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java
+++ b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.ecs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ECS2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java
index 949ff4d..dbdc5e0 100644
--- a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java
+++ b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.eks;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EKS2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
index b69f6c9..1414940 100644
--- a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
+++ b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.eventbridge;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EventbridgeEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "eventbusNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "eventbusNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java
index 1e12eaa..fb79b78 100644
--- a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java
+++ b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.iam;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class IAM2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java
index bb0f2b5..8a30a5e 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.firehose;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KinesisFirehose2EndpointUriAssembler extends org.apache.camel.suppo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java
index d6b86c8..4db49ad 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.kinesis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Kinesis2EndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java
index e6163f3..f90d86879 100644
--- a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java
+++ b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.kms;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KMS2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java
index 53ec894..ede2c1c 100644
--- a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java
+++ b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.lambda;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Lambda2EndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java
index cee88a2..1d09ffd 100644
--- a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java
+++ b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.mq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MQ2EndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java
index baf926c..5ebb783 100644
--- a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java
+++ b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.msk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MSK2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java
index 7762754..f0d4d05 100644
--- a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java
+++ b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.s3;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AWS2S3EndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java
index 58fc2c5..7c7df70 100644
--- a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java
+++ b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.ses;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Ses2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java
index 4b90fab..1db411f 100644
--- a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.sns;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Sns2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java
index ddf85ce..f83c79c 100644
--- a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java
+++ b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.sqs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Sqs2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java
index dfc163d..653a84f 100644
--- a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java
+++ b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.sts;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class STS2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java
index 24da733..6c69084 100644
--- a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java
+++ b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.translate;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Translate2EndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java
index 980147d..648518a 100644
--- a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java
+++ b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.azure.eventhubs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class EventHubsEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "eventHubName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "eventHubName", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java
index bc580a3..da89721 100644
--- a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java
+++ b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.azure.storage.blob;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class BlobEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "accountName", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "containerName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "accountName", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "containerName", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java
index ce0192b..0d59393 100644
--- a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java
+++ b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.azure.storage.queue;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class QueueEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "accountName", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "accountName", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java
index 1bfe756..52465c2 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.azure.blob;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BlobServiceEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "containerOrBlobUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "containerOrBlobUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java
index 8b9f1d9..6ccc7e9 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.azure.queue;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class QueueServiceEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "containerAndQueueUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "containerAndQueueUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java
index 376ce3b..540328d 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.bean.validator;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BeanValidatorEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java
index 07493b7..2e25661 100644
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.bean;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BeanEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java
index d69025a..e23779f 100644
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.beanclass;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ClassEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java
index 1ebd116..ffd0839 100644
--- a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java
+++ b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.beanstalk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BeanstalkEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionSettings", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionSettings", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java
index 862a91b..303cab7 100644
--- a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java
+++ b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.bonita;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BonitaEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java
index f27e746..505b08e 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.box;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class BoxEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java
index 5b91d46..7e252a0 100644
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.braintree;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class BraintreeEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java b/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java
index 525a3c5..d9852da 100644
--- a/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java
+++ b/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.browse;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BrowseEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java
index 0b30886..59ed359 100644
--- a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java
+++ b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.caffeine.cache;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CaffeineCacheEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java
index 07aea69..1c9ab37 100644
--- a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java
+++ b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.caffeine.load;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CaffeineLoadCacheEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java b/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java
index e207539..ad0c8da 100644
--- a/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java
+++ b/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cassandra;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class CassandraEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanRef", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "hosts", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "keyspace", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanRef", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "hosts", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "keyspace", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java b/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java
index cdd7dda..a10f8a4 100644
--- a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java
+++ b/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.chatscript;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class ChatScriptEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "1024", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "botName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "1024", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "botName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java b/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java
index 78ef3c7..3635df9 100644
--- a/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java
+++ b/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.chunk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ChunkEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java b/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java
index 19bb474..908cdc2 100644
--- a/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java
+++ b/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cm;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CMEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java b/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java
index 2cf479c..7afade4 100644
--- a/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java
+++ b/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cmis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CMISEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cmsUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cmsUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java b/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java
index 2f1c13f..c24f284 100644
--- a/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java
+++ b/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.coap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class CoAPEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java b/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java
index 843831b..44a0f5a 100644
--- a/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java
+++ b/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cometd;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,10 +31,12 @@ public class CometdEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "channelName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "channelName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java
index f369586..12c9ff5 100644
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.consul;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ConsulEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiEndpoint", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiEndpoint", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java b/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java
index 0fee39b..bb26fae 100644
--- a/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java
+++ b/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.controlbus;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class ControlBusEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "language", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "language", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java
index c597c16..cdcdb11 100644
--- a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java
+++ b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.corda;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CordaEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "node", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "node", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java
index 22e39f9..8c516cd 100644
--- a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java
+++ b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.couchbase;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class CouchbaseEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8091", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "8091", false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java b/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java
index aae6b78..0450ab1 100644
--- a/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java
+++ b/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.couchdb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class CouchDbEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5984", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "5984", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java b/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java
index a86bf6b..874a323 100644
--- a/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java
+++ b/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cron;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CronEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java
index a5775b3..284d05c 100644
--- a/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java
+++ b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.crypto.cms;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class CryptoCmsEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cryptoOperation", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cryptoOperation", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java
index f9233b2..535c5c0 100644
--- a/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java
+++ b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.crypto;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class DigitalSignatureEndpointUriAssembler extends org.apache.camel.suppo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cryptoOperation", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cryptoOperation", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java
index 687068f..9956a0e 100644
--- a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java
+++ b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cxf;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class CxfEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanId", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanId", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java
index d8969ad..564cc13 100644
--- a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java
+++ b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cxf.jaxrs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class CxfRsEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanId", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanId", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java b/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java
index 444fe8f8..527347b 100644
--- a/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java
+++ b/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dataformat;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class DataFormatEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java
index 9a91bac..f7091a2 100644
--- a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java
+++ b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dataset;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DataSetEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java
index d5f7e25..3e6d813 100644
--- a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java
+++ b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dataset;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DataSetTestEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java
index 97c8bbe..f7fd574 100644
--- a/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java
+++ b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.debezium;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DebeziumMongodbEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java
index 798d8d3..39a39ec 100644
--- a/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java
+++ b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.debezium;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DebeziumMySqlEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java
index a5c1a5e..a7176c8 100644
--- a/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java
+++ b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.debezium;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DebeziumPostgresEndpointUriAssembler extends org.apache.camel.suppo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java
index 366a070..da59ea3 100644
--- a/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java
+++ b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.debezium;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DebeziumSqlserverEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java b/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java
index 49877ae..8b183cf 100644
--- a/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java
+++ b/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.digitalocean;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DigitalOceanEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java b/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java
index 25bc4e4..d6f0b3f 100644
--- a/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java
+++ b/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.direct;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DirectEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java b/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java
index 9d47d1c..3b632d5 100644
--- a/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java
+++ b/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.directvm;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DirectVmEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java
index a1e808a..134bac2 100644
--- a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java
+++ b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.disruptor;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class DisruptorEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java
index 25cb018..3e9ebb303 100644
--- a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java
+++ b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.disruptor.vm;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class DisruptorVmEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java b/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java
index f2d7e27..1d099d3 100644
--- a/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java
+++ b/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.djl;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DJLEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "application", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "application", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java b/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java
index 2d699a2..99e2443 100644
--- a/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java
+++ b/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dns;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DnsEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "dnsType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "dnsType", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java b/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java
index d91d557..016ad4d 100644
--- a/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java
+++ b/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.docker;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DockerEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java b/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java
index 75d3956..7c8071c 100644
--- a/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java
+++ b/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dozer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DozerEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java b/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java
index aa68e4a..647a64b 100644
--- a/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java
+++ b/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.drill;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DrillEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java b/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java
index 2ae76b6..2838407 100644
--- a/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java
+++ b/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dropbox;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DropboxEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java b/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java
index 07fc480..f486280 100644
--- a/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java
+++ b/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ehcache;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EhcacheEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java b/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java
index af0552c..6cc6ff2 100644
--- a/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java
+++ b/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.elasticsearch;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ElasticsearchEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java
index cd6727b..50390d1 100644
--- a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java
+++ b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.elsql;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class ElsqlEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "elsqlName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "elsqlName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java
index 8e8697e..eeb29f4 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.etcd;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EtcdKeysEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java
index c608a0d..0c31af7 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.etcd;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EtcdStatsEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java
index 72db4d41..de1fd22 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.etcd;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EtcdWatchEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java b/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java
index 9f0c3c1..c631646 100644
--- a/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java
+++ b/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.exec;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ExecEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "executable", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "executable", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java b/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java
index d90a523..8ba4a95 100644
--- a/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java
+++ b/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.facebook;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FacebookEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java
index 0d2c02a..0ab3b63 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.fhir;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class FhirEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java b/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java
index 8128688..d79a31d 100644
--- a/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java
+++ b/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.file.watch;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FileWatchEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java b/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java
index f86947b..84d0015 100644
--- a/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java
+++ b/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.file;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FileEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java
index 76e88e3..75ef7e9 100644
--- a/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java
+++ b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.flatpack;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class FlatpackEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", "delim", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", "delim", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java b/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java
index a7aea31..f56f5ba 100644
--- a/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java
+++ b/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.flink;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FlinkEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "endpointType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "endpointType", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java b/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java
index 114f4e7..7f0f52f 100644
--- a/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java
+++ b/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.fop;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FopEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "outputType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "outputType", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java b/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java
index 7ef5488..fd2625e 100644
--- a/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java
+++ b/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.freemarker;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FreemarkerEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java
index f36fbb6..dc27045 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.file.remote;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class FtpEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java
index 12b0181..d288c97 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.file.remote;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class FtpsEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java
index 3671d0e..db02b43 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.file.remote;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class SftpEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java b/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java
index 523c01a..b6cec0f 100644
--- a/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java
+++ b/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ganglia;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GangliaEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "239.2.11.71", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8649", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", "239.2.11.71", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "8649", false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java b/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java
index f8bdfd6..8122958 100644
--- a/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java
+++ b/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.geocoder;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GeoCoderEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "latlng", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "latlng", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java b/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java
index 643c7b0..a3e2c53 100644
--- a/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java
+++ b/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.git;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GitEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "localPath", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "localPath", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java b/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java
index fc1e7d3..ae91997 100644
--- a/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java
+++ b/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.github;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GitHubEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "branchName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "branchName", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java
index e8642ea..3121723 100644
--- a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java
+++ b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.bigquery;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class GoogleBigQueryEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "datasetId", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "tableId", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "datasetId", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "tableId", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java
index be65f37..b2987b7 100644
--- a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java
+++ b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.bigquery.sql;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GoogleBigQuerySQLEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "query", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "query", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java
index 5f7ce70..0ab9542 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.calendar;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GoogleCalendarEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java
index afe0a35..33aeb49 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.calendar.stream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GoogleCalendarStreamEndpointUriAssembler extends org.apache.camel.s
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java
index 0bae34b..bc41f74 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.drive;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GoogleDriveEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java
index 91fe071..79e9b9a 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.mail;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GoogleMailEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java
index 2bb8b47..4b1a5a9 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.mail.stream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GoogleMailStreamEndpointUriAssembler extends org.apache.camel.suppo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java b/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java
index ae9ed31..1d7dc47 100644
--- a/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java
+++ b/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.pubsub;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GooglePubsubEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java
index 9faaf18..0c5b698 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.sheets;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GoogleSheetsEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java
index 885531b..f7c9098 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.sheets.stream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GoogleSheetsStreamEndpointUriAssembler extends org.apache.camel.sup
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java b/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java
index a9a676a..e3cecb0 100644
--- a/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java
+++ b/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.gora;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GoraEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java b/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java
index 5fd0d3d..672ace8 100644
--- a/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java
+++ b/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.grape;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GrapeEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "defaultCoordinates", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "defaultCoordinates", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java b/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java
index fefacb5..ae1722f 100644
--- a/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java
+++ b/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.graphql;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GraphqlEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java b/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java
index cabf7a9..4a6fa27 100644
--- a/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java
+++ b/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.grpc;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class GrpcEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "service", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "service", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java b/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java
index a1b704c..a1edf93 100644
--- a/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java
+++ b/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.guava.eventbus;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GuavaEventBusEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "eventBusRef", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "eventBusRef", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java
index 57950fb..6c3c8a2 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.atomicnumber;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastAtomicnumberEndpointUriAssembler extends org.apache.camel.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java
index 4c36b55..63636bc 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.instance;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastInstanceEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java
index d31448d..180614d 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.list;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastListEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java
index 65e2e2d..e417fc9 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.map;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastMapEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java
index 2279e6a..6f8a75b 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.multimap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastMultimapEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java
index 56205a9..0d67980 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.queue;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastQueueEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java
index 0378177..160b0fc 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.replicatedmap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastReplicatedmapEndpointUriAssembler extends org.apache.camel
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java
index 09c5305..6bf40d6 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.ringbuffer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastRingbufferEndpointUriAssembler extends org.apache.camel.su
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java
index 6993d08..5d7f29c 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.seda;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastSedaEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java
index 78eb02c..efca588 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.set;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastSetEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java
index f50726d..88e1560 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.topic;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastTopicEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java b/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java
index a03b0bf..1c204e5 100644
--- a/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java
+++ b/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hbase;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HBaseEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java b/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java
index aad5e54..bbe13c2 100644
--- a/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java
+++ b/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hdfs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class HdfsEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8020", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "hostName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "8020", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java b/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java
index f6e1d02..01f709f 100644
--- a/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java
+++ b/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hipchat;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class HipchatEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "80", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "80", false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java
index 07552d1..dca687c 100644
--- a/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java
+++ b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.http;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class HttpEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java
index 5d4dcba..71fa776 100644
--- a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java
+++ b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.iec60870.client;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ClientEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java
index bd58a52..4d6ea3d 100644
--- a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java
+++ b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.iec60870.server;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ServerEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java b/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java
index f2d4882..f556548 100644
--- a/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java
+++ b/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.infinispan;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class InfinispanEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java b/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java
index e7a1106..c5c9a4e 100644
--- a/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java
+++ b/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.influxdb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class InfluxDbEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java b/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java
index 07455ae..5058e28 100644
--- a/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java
+++ b/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.iota;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class IOTAEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java b/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java
index d6088b1..e7ced83 100644
--- a/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java
+++ b/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ipfs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class IPFSEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "ipfsCmd", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "ipfsCmd", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java b/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java
index bba7989..8662018 100644
--- a/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java
+++ b/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.irc;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class IrcEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java b/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java
index 6b2f826..dfb68d9 100644
--- a/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java
+++ b/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ironmq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class IronMQEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java b/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java
index b175b91..72daebd 100644
--- a/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java
+++ b/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jbpm;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class JBPMEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionURL", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "eventListenerType", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionURL", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "eventListenerType", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java b/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java
index f2cca26..83e25de 100644
--- a/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java
+++ b/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jcache;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JCacheEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java b/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java
index e97c6c8..16ac847 100644
--- a/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java
+++ b/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jclouds;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class JcloudsEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "providerId", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "providerId", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java b/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java
index a283771..3dee544 100644
--- a/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java
+++ b/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jcr;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class JcrEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "base", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "base", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java b/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java
index ca489c8..766a881 100644
--- a/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java
+++ b/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jdbc;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JdbcEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "dataSourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "dataSourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
index 68943b1c..bff5b94 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jetty9;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JettyHttp9EndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java b/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java
index 906c708..3136314 100644
--- a/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java
+++ b/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jgroups.raft;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JGroupsRaftEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java b/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java
index d98164b..c0b58e7 100644
--- a/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java
+++ b/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jgroups;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JGroupsEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java b/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java
index ccb00b1..461fc5f 100644
--- a/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java
+++ b/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.validator.jing;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JingEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java b/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java
index a67b38d..da171e6 100644
--- a/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java
+++ b/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jira;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JiraEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java
index 75a1d91..e220238 100644
--- a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java
+++ b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jms;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class JmsEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java b/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java
index d9a425f..dcb1259 100644
--- a/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java
+++ b/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jmx;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JMXEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "serverURL", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "serverURL", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java
index 64cb5e5..95be00d 100644
--- a/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java
+++ b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jolt;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JoltEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java
index cc0939e..0040731 100644
--- a/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java
+++ b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jooq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JooqEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java b/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java
index f3b0563..3b9e367 100644
--- a/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java
+++ b/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jpa;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JpaEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java b/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java
index 9126a7e..605e90a 100644
--- a/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java
+++ b/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.scp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class ScpEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java b/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java
index 7eaf21d..b8152bd 100644
--- a/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java
+++ b/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jslt;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JsltEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java b/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java
index 6fdee30..81b0960 100644
--- a/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java
+++ b/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jsonvalidator;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JsonValidatorEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java b/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java
index 2c49737..8f9dc52 100644
--- a/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java
+++ b/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jsonata;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JsonataEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java b/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java
index 2ffa3b4..e1e55fd 100644
--- a/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java
+++ b/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jt400;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,12 +25,14 @@ public class Jt400EndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "userID", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "password", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "systemName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "objectPath", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "userID", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "password", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "systemName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "objectPath", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java
index fe017da..6a02d71 100644
--- a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java
+++ b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kafka;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KafkaEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java
index 62846f2..50030a4 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.config_maps;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesConfigMapsEndpointUriAssembler extends org.apache.camel.s
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java
index e7844f1..d68fbdd 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.deployments;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesDeploymentsEndpointUriAssembler extends org.apache.camel.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java
index 247ce00..82ab880 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.hpa;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesHPAEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java
index b9441c5..9d2079d 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.job;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesJobEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java
index 791af23..2a821cd 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.namespaces;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesNamespacesEndpointUriAssembler extends org.apache.camel.s
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java
index f1368f1..95a6874 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.nodes;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesNodesEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java
index d88e0ab..96c93a2 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.persistent_volumes;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesPersistentVolumesEndpointUriAssembler extends org.apache.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java
index 810e5d8..13fd55b 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.persistent_volumes_claims;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesPersistentVolumesClaimsEndpointUriAssembler extends org.a
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java
index c3aa19f..5d3467b 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.pods;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesPodsEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java
index bf1a103..afabdbb 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.replication_controllers;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesReplicationControllersEndpointUriAssembler extends org.ap
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java
index 394acb5..9a34d36 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.resources_quota;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesResourcesQuotaEndpointUriAssembler extends org.apache.cam
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java
index e520bae..54973270 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.secrets;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesSecretsEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java
index 47a8bc0..895091a 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.service_accounts;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesServiceAccountsEndpointUriAssembler extends org.apache.ca
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java
index 66b2576..b59db05 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.services;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesServicesEndpointUriAssembler extends org.apache.camel.sup
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java
index e713479..130e6ea 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openshift.build_configs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class OpenshiftBuildConfigsEndpointUriAssembler extends org.apache.camel.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java
index 764a807..2d7c3af 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openshift.builds;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class OpenshiftBuildsEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java b/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java
index b0bce55..5e2259e 100644
--- a/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java
+++ b/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kudu;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class KuduEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java b/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java
index ff621ed..354a5c5 100644
--- a/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java
+++ b/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.language;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class LanguageEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "languageName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "languageName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java b/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java
index 981fc3c..b651d8b 100644
--- a/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java
+++ b/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ldap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class LdapEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "dirContextName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "dirContextName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java b/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java
index 64744db..c7b86f5 100644
--- a/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java
+++ b/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ldif;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class LdifEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "ldapConnectionName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "ldapConnectionName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java b/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
index 250bb46..e18bb4c 100644
--- a/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
+++ b/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.log;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class LogEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "loggerName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "loggerName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java b/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java
index 77e08fb..ff8b5da 100644
--- a/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java
+++ b/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.lucene;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class LuceneEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java b/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java
index 9ae09d6..c1ae92f 100644
--- a/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java
+++ b/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.lumberjack;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class LumberjackEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5044", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "5044", false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java
index f5fae41..2bcf7d9 100644
--- a/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java
+++ b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mail;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,9 +31,11 @@ public class MailEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java b/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java
index 6673f4d..df4157b 100644
--- a/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java
+++ b/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.master;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MasterEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "delegateUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "delegateUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java b/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java
index ce2a7c9..18bcd3b 100644
--- a/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java
+++ b/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.metrics;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MetricsEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsType", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "metricsType", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "metricsName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java b/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java
index 00294fb..5c6c678 100644
--- a/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java
+++ b/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.micrometer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class MicrometerEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsType", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "tags", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "metricsType", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "metricsName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "tags", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java b/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java
index bf3d1ab..7311c03 100644
--- a/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java
+++ b/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.microprofile.metrics;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MicroProfileMetricsEndpointUriAssembler extends org.apache.camel.su
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "metricType", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "metricType", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "metricName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java
index f460aac..60fefaf 100644
--- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java
+++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.milo.client;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MiloClientEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "endpointUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "endpointUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java
index 9a81bca..40006a4 100644
--- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java
+++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.milo.server;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MiloServerEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "itemId", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "itemId", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java b/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java
index 15fe931..be480b4 100644
--- a/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java
+++ b/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mina;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class MinaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java
index 52f4988..1d35bd1 100644
--- a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java
+++ b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.minio;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MinioEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "bucketName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "bucketName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java b/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java
index 0173826..3deb761 100644
--- a/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java
+++ b/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mllp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MllpEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java b/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java
index c3921bd..754afff 100644
--- a/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java
+++ b/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mock;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MockEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java b/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java
index d668621..ed4a9e4 100644
--- a/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java
+++ b/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mongodb.gridfs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GridFsEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java b/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java
index 9d38d90..2533c5c 100644
--- a/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java
+++ b/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mongodb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MongoDbEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java b/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java
index c860e6b..9527d9c 100644
--- a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java
+++ b/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.validator.msv;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MsvEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java b/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java
index 47b32b6..6404eb5 100644
--- a/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java
+++ b/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mustache;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MustacheEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java b/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java
index 8817245..78fa78b 100644
--- a/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java
+++ b/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mvel;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MvelEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java
index ec1fedc..1056b41 100644
--- a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java
+++ b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mybatis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MyBatisBeanEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java
index d6d887f..ae166c7 100644
--- a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java
+++ b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mybatis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MyBatisEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "statement", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "statement", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java b/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java
index 8346a62..0b120a3 100644
--- a/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java
+++ b/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.nagios;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class NagiosEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java b/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java
index 92035cb..6f1d913 100644
--- a/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java
+++ b/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.nats;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NatsEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
index 3bc4475..0d42779 100644
--- a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
+++ b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.netty.http;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class NettyHttpEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java
new file mode 100644
index 0000000..2a8ce1c
--- /dev/null
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.netty.http;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class NettyHttpEndpointUriAssemblerTest extends CamelTestSupport {
+
+    @Test
+    public void testAsEndpointUriNettyHttpHostnameWithDash() throws Exception {
+        EndpointUriAssembler assembler = context.adapt(ExtendedCamelContext.class).getEndpointUriAssembler("netty-http");
+
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("protocol", "http");
+        map.put("host", "a-b-c.hostname.tld");
+        map.put("port", "8080");
+        map.put("path", "anything");
+        String uri = assembler.buildUri(context, "netty-http", map);
+        assertEquals("netty-http:http:a-b-c.hostname.tld:8080/anything", uri);
+
+        map = new LinkedHashMap<>();
+        map.put("protocol", "http");
+        map.put("host", "a-b-c.server.net");
+        map.put("port", "8888");
+        map.put("path", "service/v3");
+        uri = assembler.buildUri(context, "netty-http", map);
+        assertEquals("netty-http:http:a-b-c.server.net:8888/service/v3", uri);
+
+        map = new HashMap<>();
+        // use http protocol
+        map.put("protocol", "http");
+        map.put("host", "localhost");
+        map.put("port", "8080");
+        map.put("path", "foo/bar");
+        map.put("disconnect", "true");
+
+        uri = assembler.buildUri(context, "netty-http", map);
+        assertEquals("netty-http:http:localhost:8080/foo/bar?disconnect=true", uri);
+
+        // lets switch protocol
+        map.put("protocol", "https");
+
+        uri = assembler.buildUri(context, "netty-http", map);
+        assertEquals("netty-http:https:localhost:8080/foo/bar?disconnect=true", uri);
+
+        // lets set a query parameter in the path
+        map.put("path", "foo/bar?verbose=true");
+        map.put("disconnect", "true");
+
+        uri = assembler.buildUri(context, "netty-http", map);
+        assertEquals("netty-http:https:localhost:8080/foo/bar?verbose=true&disconnect=true", uri);
+    }
+
+}
diff --git a/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java b/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java
index dea5b40..8352448 100644
--- a/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java
+++ b/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.netty;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class NettyEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java b/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java
index dd84afb..cc2c22d 100644
--- a/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java
+++ b/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.nitrite;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NitriteEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java b/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java
index d529a99..98fba8d 100644
--- a/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java
+++ b/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.nsq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NsqEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java b/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java
index 50b9056..4d076d9 100644
--- a/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java
+++ b/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.oaipmh.component;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class OAIPMHEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "baseUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "baseUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java
index 08e3f95..84c55b5 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.olingo2;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class Olingo2EndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java
index 47e7a30..b34f7fb 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.olingo4;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class Olingo4EndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java
index 9bfb9a3..840fd40 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.cinder;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CinderEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java
index 0f9c855..7581a8d 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.glance;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GlanceEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java
index 1b11faa..202ac83 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.keystone;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KeystoneEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java
index ab51c4e..91416d1 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.neutron;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NeutronEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java
index 52e600d..86571d0 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.nova;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NovaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java
index eccfeca..ea4ed23 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.swift;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SwiftEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java b/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java
index c94514c..6d41946 100644
--- a/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java
+++ b/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.optaplanner;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class OptaPlannerEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "configFile", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "configFile", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java b/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java
index 6f51096..8951e60 100644
--- a/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java
+++ b/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.paho;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class PahoEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java b/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java
index f98107f..0f45200 100644
--- a/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java
+++ b/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.pdf;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class PdfEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java b/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java
index 7704ee4..979de7b 100644
--- a/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java
+++ b/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.pg.replication.slot;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,12 +25,14 @@ public class PgReplicationSlotEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "slot", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5432", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "outputPlugin", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "slot", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "5432", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "outputPlugin", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java b/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java
index f75b634..96ed10c 100644
--- a/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java
+++ b/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.pgevent;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class PgEventEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5432", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "5432", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java b/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java
index 9b570ea..3fc8f15 100644
--- a/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java
+++ b/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.platform.http;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class PlatformHttpEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java b/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java
index 0c64812..341c879 100644
--- a/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java
+++ b/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.printer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class PrinterEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "printername", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "printername", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java
index ad7c55a..795d589 100644
--- a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java
+++ b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.pubnub;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class PubNubEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java b/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java
index b36e2fc..bc7d0c2 100644
--- a/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java
+++ b/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.pulsar;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class PulsarEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "persistence", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "tenant", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "persistence", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "tenant", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java
index b4e1836..0292c44 100644
--- a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java
+++ b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.quartz;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class QuartzEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "groupName", "Camel", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "triggerName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "groupName", "Camel", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "triggerName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java b/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java
index 9c8b077..279f4b9 100644
--- a/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java
+++ b/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.quickfixj;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class QuickfixjEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "configurationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "configurationName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java b/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java
index a87e623..9d4e48b 100644
--- a/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java
+++ b/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rabbitmq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class RabbitMQEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "exchangeName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "exchangeName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java b/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java
index 9960256..0f794e9 100644
--- a/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java
+++ b/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.reactive.streams;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ReactiveStreamsEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "stream", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "stream", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java b/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java
index 2bfb60b..3b9a8fb 100644
--- a/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java
+++ b/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ref;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class RefEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java b/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java
index e674a4d..f71e638 100644
--- a/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java
+++ b/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rest.openapi;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class RestOpenApiEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "specificationUri", "openapi.json", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operationId", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "specificationUri", "openapi.json", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "operationId", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java b/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java
index 518da0a..30bdb94 100644
--- a/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java
+++ b/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rest.swagger;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class RestSwaggerEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "specificationUri", "swagger.json", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operationId", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "specificationUri", "swagger.json", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "operationId", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java
index 073fb30..2afd38e 100644
--- a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java
+++ b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rest;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class RestApiEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "contextIdPattern", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "contextIdPattern", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java
index ba3c2d3..8db0eed 100644
--- a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java
+++ b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rest;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class RestEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "method", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "uriTemplate", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "method", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "uriTemplate", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java b/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java
index 7552198..4b5ec11 100644
--- a/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java
+++ b/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.resteasy;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ResteasyEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java b/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java
index 20a3bd0..0f4069b 100644
--- a/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java
+++ b/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.robotframework;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class RobotFrameworkEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java b/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java
index fcd2d08..d920fde 100644
--- a/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java
+++ b/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rss;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class RssEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "feedUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "feedUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java b/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java
index 9c799fe..8f5148c 100644
--- a/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java
+++ b/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.saga;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SagaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "action", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "action", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java
index 11e61fd..09f6c5f 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.salesforce;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class SalesforceEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operationName", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "topicName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operationName", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "topicName", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java b/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java
index c9cae37..5a5c30d 100644
--- a/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java
+++ b/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sap.netweaver;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NetWeaverEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "url", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "url", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java b/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java
index ee523e2..134dc3e 100644
--- a/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java
+++ b/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xquery;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XQueryEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java b/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java
index 15cfe6c..2b0d77c 100644
--- a/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java
+++ b/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.scheduler;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SchedulerEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java b/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java
index f473c95..701e003 100644
--- a/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java
+++ b/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.schematron;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SchematronEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java b/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java
index b36fc25..c70d641 100644
--- a/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java
+++ b/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.seda;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SedaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java b/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java
index 1a19021..dc6c21d 100644
--- a/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java
+++ b/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.service;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ServiceEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "delegateUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "delegateUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java b/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java
index 9b76d9b..0d1d666 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java
+++ b/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.servicenow;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ServiceNowEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "instanceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "instanceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java b/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java
index 916635e..6440299 100644
--- a/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java
+++ b/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.servlet;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ServletEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "contextPath", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "contextPath", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java b/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java
index 06cbc39..1467fbe 100644
--- a/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java
+++ b/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sip;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class SipEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java
index 728d2da..752080e 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sjms;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class SjmsEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java
index 73fbe4b..c7c075f 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sjms.batch;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SjmsBatchEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java
index 7a08abc..c274e2c 100644
--- a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java
+++ b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sjms2;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class Sjms2EndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java b/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java
index 44265c2..4f26a07 100644
--- a/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java
+++ b/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.slack;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SlackEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java b/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java
index f046a1a..a5afe72 100644
--- a/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java
+++ b/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.smpp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,9 +31,11 @@ public class SmppEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "2775", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "2775", false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java b/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java
index 05960f6..148db1b 100644
--- a/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java
+++ b/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.snmp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class SnmpEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java b/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java
index 76819c2..60bf588 100644
--- a/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java
+++ b/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.solr;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class SolrEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "url", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "url", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java b/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java
index fa0b8d1..b64ebae 100644
--- a/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java
+++ b/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.soroushbot.component;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SoroushBotEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "action", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "action", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java b/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java
index 7275093..0fe9b6c 100644
--- a/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java
+++ b/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.spark;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SparkEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "endpointType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "endpointType", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java b/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java
index e1801b3..219cbe0 100644
--- a/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java
+++ b/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.splunkhec;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class SplunkHECEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "splunkURL", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "token", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "splunkURL", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "token", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java b/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java
index 9fa989b..ed45166 100644
--- a/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java
+++ b/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.splunk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SplunkEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java b/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java
index 2857b90..b64d34d 100644
--- a/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java
+++ b/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.spring.batch;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SpringBatchEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "jobName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "jobName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java b/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java
index edd068c..1605b9f 100644
--- a/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java
+++ b/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.spring.integration;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SpringIntegrationEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "defaultChannel", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "defaultChannel", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java b/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java
index 8b7e417..6cbb4b0 100644
--- a/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java
+++ b/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.springldap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SpringLdapEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "templateName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "templateName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java
index fd08d18..1c0c293 100644
--- a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java
+++ b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.redis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class RedisEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java
index b565a92..5087fb5 100644
--- a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java
+++ b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.spring.ws;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class SpringWebserviceEndpointUriAssembler extends org.apache.camel.suppo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "lookupKey", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "webServiceEndpointUri", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "expression", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "lookupKey", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "webServiceEndpointUri", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "expression", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java b/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java
index 51ebf77..8bb6ed2 100644
--- a/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java
+++ b/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.event;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EventEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java
index 1637a89..fe729b4 100644
--- a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java
+++ b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sql;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SqlEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "query", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "query", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java
index 4e20528..2fb16f9 100644
--- a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java
+++ b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sql.stored;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SqlStoredEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "template", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "template", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java b/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java
index 54ca812..7c39d83 100644
--- a/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java
+++ b/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ssh;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class SshEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "22", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "22", false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java b/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java
index ed2345c..d92525e 100644
--- a/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java
+++ b/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.stax;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class StAXEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "contentHandlerClass", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "contentHandlerClass", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java b/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java
index 4361300..1ce784a 100644
--- a/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java
+++ b/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.stomp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class StompEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destination", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destination", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java
index 3413087..6a5a066 100644
--- a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java
+++ b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.stream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class StreamEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "kind", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "kind", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java b/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java
index b1e8e74..92dcca0 100644
--- a/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java
+++ b/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.stringtemplate;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class StringTemplateEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java b/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java
index 2314997..70068fa 100644
--- a/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java
+++ b/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.stub;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class StubEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java b/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java
index 740b347..b2cb291 100644
--- a/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java
+++ b/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.telegram;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TelegramEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java b/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java
index aaface0..681ca33 100644
--- a/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java
+++ b/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.thrift;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class ThriftEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "service", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "service", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java b/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java
index 7f04c05..9ce83ab 100644
--- a/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java
+++ b/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.tika;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TikaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java b/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java
index 9302d1b..4688aa9 100644
--- a/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java
+++ b/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.timer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TimerEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "timerName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "timerName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java
index cc9de83..4ce75c3 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.twilio;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class TwilioEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java
index 3eaccf4..e9fe334 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.twitter.directmessage;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TwitterDirectMessageEndpointUriAssembler extends org.apache.camel.s
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "user", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "user", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java
index 8b2a214..1bcb67b 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.twitter.search;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TwitterSearchEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "keywords", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "keywords", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java
index c18ac64..7311e3b 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.twitter.timeline;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TwitterTimelineEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "timelineType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "timelineType", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java b/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java
index 03c7f7b..dc44e61 100644
--- a/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java
+++ b/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.undertow;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class UndertowEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpURI", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpURI", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java b/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java
index 7d6bf11..a6b9a79 100644
--- a/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java
+++ b/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.validator;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ValidatorEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriAssembler.java b/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriAssembler.java
index 8ed89eb..dea0b24 100644
--- a/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriAssembler.java
+++ b/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.velocity;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class VelocityEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriAssembler.java b/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriAssembler.java
index 94d2311..e0a7adb 100644
--- a/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriAssembler.java
+++ b/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.vertx.http;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class VertxHttpEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriAssembler.java b/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriAssembler.java
index 2be1df1..980e231 100644
--- a/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriAssembler.java
+++ b/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.vertx.websocket;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class VertxWebsocketEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "0.0.0.0", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "0", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", "/", true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", "0.0.0.0", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "0", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "path", "/", true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriAssembler.java b/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriAssembler.java
index ca87945..3c3d80b 100644
--- a/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriAssembler.java
+++ b/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.vertx;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class VertxEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "address", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriAssembler.java b/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriAssembler.java
index f87e4b5..b17e6fe 100644
--- a/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriAssembler.java
+++ b/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.vm;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class VmEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriAssembler.java b/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriAssembler.java
index 562a68b..4ccee97 100644
--- a/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriAssembler.java
+++ b/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.weather;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class WeatherEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriAssembler.java b/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriAssembler.java
index 91a1166..9b0be5e 100644
--- a/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriAssembler.java
+++ b/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.web3j;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Web3jEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "nodeAddress", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "nodeAddress", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriAssembler.java b/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriAssembler.java
index 8413cb5..15fc71f 100644
--- a/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriAssembler.java
+++ b/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.webhook;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class WebhookEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "endpointUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "endpointUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriAssembler.java b/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriAssembler.java
index b772ab6..24b357a 100644
--- a/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriAssembler.java
+++ b/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.websocket.jsr356;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JSR356WebSocketEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriAssembler.java b/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriAssembler.java
index b3879ad..65db8fc 100644
--- a/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriAssembler.java
+++ b/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.websocket;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class WebsocketEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "0.0.0.0", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "9292", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", "0.0.0.0", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "9292", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriAssembler.java b/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriAssembler.java
index 108c095..af34523 100644
--- a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriAssembler.java
+++ b/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.weka;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class WekaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriAssembler.java b/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriAssembler.java
index 64886a2..353f9a5 100644
--- a/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriAssembler.java
+++ b/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.wordpress;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class WordpressEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operationDetail", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "operationDetail", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriAssembler.java b/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriAssembler.java
index ae2e491..f8cb543 100644
--- a/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriAssembler.java
+++ b/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.workday;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class WorkdayEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "entity", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "entity", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriAssembler.java b/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriAssembler.java
index 09c1b24..dc461ee 100644
--- a/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriAssembler.java
+++ b/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xchange;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XChangeEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriAssembler.java b/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriAssembler.java
index 966891a..a4b8108 100644
--- a/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriAssembler.java
+++ b/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xj;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XJEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriAssembler.java b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriAssembler.java
index ce37bc3..65b6699 100644
--- a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriAssembler.java
+++ b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xmlsecurity;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XmlSignerEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriAssembler.java b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriAssembler.java
index 64744f5..d5f6249 100644
--- a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriAssembler.java
+++ b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xmlsecurity;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XmlVerifierEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriAssembler.java b/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriAssembler.java
index 4af888d..2e053e0 100644
--- a/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriAssembler.java
+++ b/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xmpp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class XmppEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "participant", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "participant", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriAssembler.java b/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriAssembler.java
index eb85752..67dd877 100644
--- a/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriAssembler.java
+++ b/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xslt.saxon;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XsltSaxonEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriAssembler.java b/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriAssembler.java
index 4e1603c..8b9c857 100644
--- a/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriAssembler.java
+++ b/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xslt;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XsltEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriAssembler.java b/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriAssembler.java
index fa59e86..c77fc33 100644
--- a/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriAssembler.java
+++ b/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.yammer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class YammerEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriAssembler.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriAssembler.java
index 99dbc06..39295e3 100644
--- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriAssembler.java
+++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.zendesk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ZendeskEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriAssembler.java b/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriAssembler.java
index 5757cda..43c771b 100644
--- a/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriAssembler.java
+++ b/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.zookeepermaster;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MasterEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "groupName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "consumerEndpointUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "groupName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "consumerEndpointUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriAssembler.java b/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriAssembler.java
index 49c5535..69f652c 100644
--- a/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriAssembler.java
+++ b/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.zookeeper;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class ZooKeeperEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "serverUrls", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "serverUrls", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
index cb6ee24..cfcb0d5 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
@@ -68,7 +68,14 @@ public abstract class EndpointUriAssemblerSupport {
         Map<String, Object> map = new TreeMap<>(parameters);
         String query = URISupport.createQueryString(map);
         if (ObjectHelper.isNotEmpty(query)) {
-            uri = uri + "?" + query;
+            // there may be a ? sign in the context path then use & instead
+            // (this is not correct but lets deal with this as the camel-catalog handled this)
+            boolean questionMark = uri.indexOf('?') != -1;
+            if (questionMark) {
+                uri = uri + "&" + query;
+            } else {
+                uri = uri + "?" + query;
+            }
         }
         return uri;
     }
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
index ebb61f9..90e8f0b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
@@ -37,6 +37,7 @@ public final class EndpointUriAssemblerGenerator {
         w.write("package " + pn + ";\n");
         w.write("\n");
         w.write("import java.net.URISyntaxException;\n");
+        w.write("import java.util.HashMap;\n");
         w.write("import java.util.Map;\n");
         w.write("\n");
         w.write("import org.apache.camel.CamelContext;\n");
@@ -73,11 +74,13 @@ public final class EndpointUriAssemblerGenerator {
         w.write("        String syntax = scheme + BASE;\n");
         w.write("        String uri = syntax;\n");
         w.write("\n");
+        w.write("        Map<String, Object> copy = new HashMap<>(parameters);\n");
+        w.write("\n");
         for (BaseOptionModel option : model.getEndpointPathOptions()) {
             w.write("        uri = buildPathParameter(camelContext, syntax, uri, \"" + option.getName() + "\", "
-                    + defaultValue(option) + ", " + option.isRequired() + ", parameters);\n");
+                    + defaultValue(option) + ", " + option.isRequired() + ", copy);\n");
         }
-        w.write("        uri = buildQueryParameters(camelContext, uri, parameters);\n");
+        w.write("        uri = buildQueryParameters(camelContext, uri, copy);\n");
         w.write("        return uri;\n");
         w.write("    }\n");
         w.write("}\n");