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/12/14 19:06:48 UTC

[camel] branch master updated (de8fc8a -> afc6fed)

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

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


    from de8fc8a  Regen for commit b3c62273fa540ab1001827155124dc8035492214
     new 3633ff1  CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped.
     new afc6fed  CAMEL-15946: Regen

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


Summary of changes:
 .../dsl/AtomixMapComponentBuilderFactory.java      | 11 +++++------
 .../AtomixMessagingComponentBuilderFactory.java    | 11 +++++------
 .../dsl/AtomixMultimapComponentBuilderFactory.java | 11 +++++------
 .../dsl/AtomixQueueComponentBuilderFactory.java    | 11 +++++------
 .../dsl/AtomixSetComponentBuilderFactory.java      | 11 +++++------
 .../dsl/AtomixValueComponentBuilderFactory.java    | 11 +++++------
 .../dsl/Aws2SesComponentBuilderFactory.java        |  6 ++++--
 .../dsl/AwsSesComponentBuilderFactory.java         |  6 ++++--
 .../dsl/AwsSwfComponentBuilderFactory.java         | 12 ++++++------
 .../dsl/AzureBlobComponentBuilderFactory.java      |  4 ++--
 .../dsl/AzureEventhubsComponentBuilderFactory.java |  4 ++--
 .../component/dsl/BoxComponentBuilderFactory.java  |  4 ++--
 .../dsl/CometdComponentBuilderFactory.java         |  2 +-
 .../dsl/CometdsComponentBuilderFactory.java        |  2 +-
 .../dsl/ConsulComponentBuilderFactory.java         |  3 ++-
 .../dsl/CordaComponentBuilderFactory.java          |  5 ++---
 .../DebeziumMongodbComponentBuilderFactory.java    |  6 +++---
 .../dsl/DebeziumMysqlComponentBuilderFactory.java  |  6 +++---
 .../DebeziumPostgresComponentBuilderFactory.java   |  6 +++---
 .../DebeziumSqlserverComponentBuilderFactory.java  |  6 +++---
 .../dsl/DockerComponentBuilderFactory.java         |  4 ++--
 .../dsl/EhcacheComponentBuilderFactory.java        |  4 ++--
 ...oogleCalendarStreamComponentBuilderFactory.java |  3 ++-
 .../dsl/GoogleDriveComponentBuilderFactory.java    |  3 ++-
 .../GoogleSheetsStreamComponentBuilderFactory.java |  3 ++-
 .../dsl/GuavaEventbusComponentBuilderFactory.java  |  3 ++-
 .../dsl/InfinispanComponentBuilderFactory.java     |  4 ++--
 .../dsl/JcloudsComponentBuilderFactory.java        |  6 ++++--
 .../dsl/JettyComponentBuilderFactory.java          | 16 ++++++++--------
 .../component/dsl/JsltComponentBuilderFactory.java |  2 +-
 .../dsl/KafkaComponentBuilderFactory.java          | 10 +++++-----
 .../dsl/MiloServerComponentBuilderFactory.java     |  2 +-
 .../component/dsl/MinaComponentBuilderFactory.java |  2 +-
 .../dsl/NettyComponentBuilderFactory.java          | 10 ++++++----
 .../dsl/NettyHttpComponentBuilderFactory.java      | 10 ++++++----
 .../dsl/Olingo2ComponentBuilderFactory.java        |  4 ++--
 .../dsl/Olingo4ComponentBuilderFactory.java        |  4 ++--
 .../dsl/RabbitmqComponentBuilderFactory.java       | 16 ++++++++--------
 .../dsl/SalesforceComponentBuilderFactory.java     | 22 ++++++++++++----------
 .../component/dsl/SedaComponentBuilderFactory.java |  2 +-
 .../dsl/ServicenowComponentBuilderFactory.java     | 12 ++++++------
 .../component/dsl/SmppComponentBuilderFactory.java |  4 ++--
 .../dsl/SmppsComponentBuilderFactory.java          |  4 ++--
 .../component/dsl/StubComponentBuilderFactory.java |  2 +-
 .../dsl/VertxKafkaComponentBuilderFactory.java     | 20 ++++++++++----------
 .../component/dsl/VmComponentBuilderFactory.java   |  2 +-
 .../dsl/Web3jComponentBuilderFactory.java          |  6 ++++--
 .../dsl/WordpressComponentBuilderFactory.java      |  4 ++--
 .../component/dsl/XjComponentBuilderFactory.java   |  4 ++--
 .../XmlsecuritySignComponentBuilderFactory.java    |  9 +++++----
 .../XmlsecurityVerifyComponentBuilderFactory.java  |  4 ++--
 .../dsl/XqueryComponentBuilderFactory.java         |  4 ++--
 .../dsl/XsltSaxonComponentBuilderFactory.java      |  4 ++--
 .../ComponentDslBuilderFactoryGenerator.java       |  5 ++++-
 .../ComponentDslInnerBuilderGenerator.java         | 11 +++++++----
 .../ComponentsBuilderFactoryGenerator.java         |  6 +++++-
 56 files changed, 196 insertions(+), 173 deletions(-)


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

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

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

commit afc6fedc4cfce0854ae81252af14b3cb8892d46f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 14 19:59:22 2020 +0100

    CAMEL-15946: Regen
---
 .../dsl/AtomixMapComponentBuilderFactory.java      | 11 +++++------
 .../AtomixMessagingComponentBuilderFactory.java    | 11 +++++------
 .../dsl/AtomixMultimapComponentBuilderFactory.java | 11 +++++------
 .../dsl/AtomixQueueComponentBuilderFactory.java    | 11 +++++------
 .../dsl/AtomixSetComponentBuilderFactory.java      | 11 +++++------
 .../dsl/AtomixValueComponentBuilderFactory.java    | 11 +++++------
 .../dsl/Aws2SesComponentBuilderFactory.java        |  6 ++++--
 .../dsl/AwsSesComponentBuilderFactory.java         |  6 ++++--
 .../dsl/AwsSwfComponentBuilderFactory.java         | 12 ++++++------
 .../dsl/AzureBlobComponentBuilderFactory.java      |  4 ++--
 .../dsl/AzureEventhubsComponentBuilderFactory.java |  4 ++--
 .../component/dsl/BoxComponentBuilderFactory.java  |  4 ++--
 .../dsl/CometdComponentBuilderFactory.java         |  2 +-
 .../dsl/CometdsComponentBuilderFactory.java        |  2 +-
 .../dsl/ConsulComponentBuilderFactory.java         |  3 ++-
 .../dsl/CordaComponentBuilderFactory.java          |  5 ++---
 .../DebeziumMongodbComponentBuilderFactory.java    |  6 +++---
 .../dsl/DebeziumMysqlComponentBuilderFactory.java  |  6 +++---
 .../DebeziumPostgresComponentBuilderFactory.java   |  6 +++---
 .../DebeziumSqlserverComponentBuilderFactory.java  |  6 +++---
 .../dsl/DockerComponentBuilderFactory.java         |  4 ++--
 .../dsl/EhcacheComponentBuilderFactory.java        |  4 ++--
 ...oogleCalendarStreamComponentBuilderFactory.java |  3 ++-
 .../dsl/GoogleDriveComponentBuilderFactory.java    |  3 ++-
 .../GoogleSheetsStreamComponentBuilderFactory.java |  3 ++-
 .../dsl/GuavaEventbusComponentBuilderFactory.java  |  3 ++-
 .../dsl/InfinispanComponentBuilderFactory.java     |  4 ++--
 .../dsl/JcloudsComponentBuilderFactory.java        |  6 ++++--
 .../dsl/JettyComponentBuilderFactory.java          | 16 ++++++++--------
 .../component/dsl/JsltComponentBuilderFactory.java |  2 +-
 .../dsl/KafkaComponentBuilderFactory.java          | 10 +++++-----
 .../dsl/MiloServerComponentBuilderFactory.java     |  2 +-
 .../component/dsl/MinaComponentBuilderFactory.java |  2 +-
 .../dsl/NettyComponentBuilderFactory.java          | 10 ++++++----
 .../dsl/NettyHttpComponentBuilderFactory.java      | 10 ++++++----
 .../dsl/Olingo2ComponentBuilderFactory.java        |  4 ++--
 .../dsl/Olingo4ComponentBuilderFactory.java        |  4 ++--
 .../dsl/RabbitmqComponentBuilderFactory.java       | 16 ++++++++--------
 .../dsl/SalesforceComponentBuilderFactory.java     | 22 ++++++++++++----------
 .../component/dsl/SedaComponentBuilderFactory.java |  2 +-
 .../dsl/ServicenowComponentBuilderFactory.java     | 12 ++++++------
 .../component/dsl/SmppComponentBuilderFactory.java |  4 ++--
 .../dsl/SmppsComponentBuilderFactory.java          |  4 ++--
 .../component/dsl/StubComponentBuilderFactory.java |  2 +-
 .../dsl/VertxKafkaComponentBuilderFactory.java     | 20 ++++++++++----------
 .../component/dsl/VmComponentBuilderFactory.java   |  2 +-
 .../dsl/Web3jComponentBuilderFactory.java          |  6 ++++--
 .../dsl/WordpressComponentBuilderFactory.java      |  4 ++--
 .../component/dsl/XjComponentBuilderFactory.java   |  4 ++--
 .../XmlsecuritySignComponentBuilderFactory.java    |  9 +++++----
 .../XmlsecurityVerifyComponentBuilderFactory.java  |  4 ++--
 .../dsl/XqueryComponentBuilderFactory.java         |  4 ++--
 .../dsl/XsltSaxonComponentBuilderFactory.java      |  4 ++--
 53 files changed, 180 insertions(+), 167 deletions(-)

diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java
index 766e0d5..dd75013 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java
@@ -114,8 +114,7 @@ public interface AtomixMapComponentBuilderFactory {
          * The nodes the AtomixClient should connect to.
          * 
          * The option is a:
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          * 
          * Group: common
          */
@@ -272,8 +271,8 @@ public interface AtomixMapComponentBuilderFactory {
         /**
          * Cluster wide resources configuration.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
@@ -285,8 +284,8 @@ public interface AtomixMapComponentBuilderFactory {
         /**
          * Local resources configurations.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMessagingComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMessagingComponentBuilderFactory.java
index 8a04cd7..f7497f6 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMessagingComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMessagingComponentBuilderFactory.java
@@ -140,8 +140,7 @@ public interface AtomixMessagingComponentBuilderFactory {
          * The nodes the AtomixClient should connect to.
          * 
          * The option is a:
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          * 
          * Group: common
          */
@@ -287,8 +286,8 @@ public interface AtomixMessagingComponentBuilderFactory {
         /**
          * Cluster wide resources configuration.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
@@ -300,8 +299,8 @@ public interface AtomixMessagingComponentBuilderFactory {
         /**
          * Local resources configurations.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMultimapComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMultimapComponentBuilderFactory.java
index 2fa591b..581d056 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMultimapComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMultimapComponentBuilderFactory.java
@@ -135,8 +135,7 @@ public interface AtomixMultimapComponentBuilderFactory {
          * The nodes the AtomixClient should connect to.
          * 
          * The option is a:
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          * 
          * Group: producer
          */
@@ -253,8 +252,8 @@ public interface AtomixMultimapComponentBuilderFactory {
         /**
          * Cluster wide resources configuration.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
@@ -266,8 +265,8 @@ public interface AtomixMultimapComponentBuilderFactory {
         /**
          * Local resources configurations.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixQueueComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixQueueComponentBuilderFactory.java
index aed412d..34bdf79 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixQueueComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixQueueComponentBuilderFactory.java
@@ -102,8 +102,7 @@ public interface AtomixQueueComponentBuilderFactory {
          * The nodes the AtomixClient should connect to.
          * 
          * The option is a:
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          * 
          * Group: common
          */
@@ -249,8 +248,8 @@ public interface AtomixQueueComponentBuilderFactory {
         /**
          * Cluster wide resources configuration.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
@@ -262,8 +261,8 @@ public interface AtomixQueueComponentBuilderFactory {
         /**
          * Local resources configurations.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixSetComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixSetComponentBuilderFactory.java
index 2b20397..d147c0f 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixSetComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixSetComponentBuilderFactory.java
@@ -102,8 +102,7 @@ public interface AtomixSetComponentBuilderFactory {
          * The nodes the AtomixClient should connect to.
          * 
          * The option is a:
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          * 
          * Group: common
          */
@@ -260,8 +259,8 @@ public interface AtomixSetComponentBuilderFactory {
         /**
          * Cluster wide resources configuration.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
@@ -273,8 +272,8 @@ public interface AtomixSetComponentBuilderFactory {
         /**
          * Local resources configurations.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixValueComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixValueComponentBuilderFactory.java
index d0df90f..54a83bf 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixValueComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixValueComponentBuilderFactory.java
@@ -102,8 +102,7 @@ public interface AtomixValueComponentBuilderFactory {
          * The nodes the AtomixClient should connect to.
          * 
          * The option is a:
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          * 
          * Group: common
          */
@@ -260,8 +259,8 @@ public interface AtomixValueComponentBuilderFactory {
         /**
          * Cluster wide resources configuration.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
@@ -273,8 +272,8 @@ public interface AtomixValueComponentBuilderFactory {
         /**
          * Local resources configurations.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.util.Properties></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SesComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SesComponentBuilderFactory.java
index 5cb0e29..c72cad0 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SesComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SesComponentBuilderFactory.java
@@ -148,7 +148,8 @@ public interface Aws2SesComponentBuilderFactory {
          * List of reply-to email address(es) for the message, override it using
          * 'CamelAwsSesReplyToAddresses' header.
          * 
-         * The option is a: <code>java.util.List<java.lang.String></code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: producer
          */
@@ -185,7 +186,8 @@ public interface Aws2SesComponentBuilderFactory {
          * List of destination email address. Can be overriden with
          * 'CamelAwsSesTo' header.
          * 
-         * The option is a: <code>java.util.List<java.lang.String></code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: producer
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSesComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSesComponentBuilderFactory.java
index 06bb058..67c9719 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSesComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSesComponentBuilderFactory.java
@@ -162,7 +162,8 @@ public interface AwsSesComponentBuilderFactory {
          * List of reply-to email address(es) for the message, override it using
          * 'CamelAwsSesReplyToAddresses' header.
          * 
-         * The option is a: <code>java.util.List<java.lang.String></code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: producer
          */
@@ -199,7 +200,8 @@ public interface AwsSesComponentBuilderFactory {
          * List of destination email address. Can be overriden with
          * 'CamelAwsSesTo' header.
          * 
-         * The option is a: <code>java.util.List<java.lang.String></code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: producer
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSwfComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSwfComponentBuilderFactory.java
index ed1f969..f403321 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSwfComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSwfComponentBuilderFactory.java
@@ -260,8 +260,8 @@ public interface AwsSwfComponentBuilderFactory {
          * To configure the ClientConfiguration using the key/values from the
          * Map.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */
@@ -274,8 +274,8 @@ public interface AwsSwfComponentBuilderFactory {
          * To configure the StartWorkflowOptions using the key/values from the
          * Map.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */
@@ -288,8 +288,8 @@ public interface AwsSwfComponentBuilderFactory {
          * To configure the AmazonSimpleWorkflowClient using the key/values from
          * the Map.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureBlobComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureBlobComponentBuilderFactory.java
index 8f9929f..c4796f1 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureBlobComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureBlobComponentBuilderFactory.java
@@ -196,8 +196,8 @@ public interface AzureBlobComponentBuilderFactory {
         /**
          * Set the blob meta-data.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          * 
          * Group: producer
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureEventhubsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureEventhubsComponentBuilderFactory.java
index 617ee60..2ccee2b 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureEventhubsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureEventhubsComponentBuilderFactory.java
@@ -230,8 +230,8 @@ public interface AzureEventhubsComponentBuilderFactory {
          * of the partition will start from {link EventPosition#latest() latest}
          * position.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * com.azure.messaging.eventhubs.models.EventPosition></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * com.azure.messaging.eventhubs.models.EventPosition&gt;</code> type.
          * 
          * Group: consumer
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
index 85fc858..46537ce 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
@@ -153,8 +153,8 @@ public interface BoxComponentBuilderFactory {
         /**
          * Custom HTTP params for settings like proxy host.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java
index cf3ff21..e18d4f3 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java
@@ -112,7 +112,7 @@ public interface CometdComponentBuilderFactory {
          * incoming and outgoing requests.
          * 
          * The option is a:
-         * <code>java.util.List<org.cometd.bayeux.server.BayeuxServer.Extension></code> type.
+         * <code>java.util.List&lt;org.cometd.bayeux.server.BayeuxServer.Extension&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java
index e1fd0f7..1770004 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java
@@ -113,7 +113,7 @@ public interface CometdsComponentBuilderFactory {
          * incoming and outgoing requests.
          * 
          * The option is a:
-         * <code>java.util.List<org.cometd.bayeux.server.BayeuxServer.Extension></code> type.
+         * <code>java.util.List&lt;org.cometd.bayeux.server.BayeuxServer.Extension&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
index 54cb193..389c83c 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
@@ -319,7 +319,8 @@ public interface ConsulComponentBuilderFactory {
         /**
          * The note meta-data to use for queries.
          * 
-         * The option is a: <code>java.util.List<java.lang.String></code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java
index 6126f6c..fdaf2db 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java
@@ -139,8 +139,7 @@ public interface CordaComponentBuilderFactory {
          * free.
          * 
          * The option is a:
-         * <code>java.lang.Class<net.corda.core.contracts.ContractState></code>
-         * type.
+         * <code>java.lang.Class&lt;net.corda.core.contracts.ContractState&gt;</code> type.
          * 
          * Group: consumer (advanced)
          */
@@ -171,7 +170,7 @@ public interface CordaComponentBuilderFactory {
          * net.corda.core.flows.StartableByRPC.
          * 
          * The option is a:
-         * <code>java.lang.Class<net.corda.core.flows.FlowLogic<java.lang.Object>></code> type.
+         * <code>java.lang.Class&lt;net.corda.core.flows.FlowLogic&lt;java.lang.Object&gt;&gt;</code> type.
          * 
          * Group: consumer (advanced)
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java
index 974676f..40d0b5a 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java
@@ -54,10 +54,10 @@ public interface DebeziumMongodbComponentBuilderFactory {
          * properties needed by Debezium engine, for example setting
          * KafkaOffsetBackingStore), the properties have to be prefixed with
          * additionalProperties.. E.g:
-         * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+         * additionalProperties.transactional.id=12345&amp;additionalProperties.schema.registry.url=http://localhost:8811/avro.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: common
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java
index 1617484..5d85e27 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java
@@ -54,10 +54,10 @@ public interface DebeziumMysqlComponentBuilderFactory {
          * properties needed by Debezium engine, for example setting
          * KafkaOffsetBackingStore), the properties have to be prefixed with
          * additionalProperties.. E.g:
-         * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+         * additionalProperties.transactional.id=12345&amp;additionalProperties.schema.registry.url=http://localhost:8811/avro.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: common
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java
index 26a41e2..5e1b447 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java
@@ -54,10 +54,10 @@ public interface DebeziumPostgresComponentBuilderFactory {
          * properties needed by Debezium engine, for example setting
          * KafkaOffsetBackingStore), the properties have to be prefixed with
          * additionalProperties.. E.g:
-         * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+         * additionalProperties.transactional.id=12345&amp;additionalProperties.schema.registry.url=http://localhost:8811/avro.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: common
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java
index b310945..ddc6e3a 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java
@@ -54,10 +54,10 @@ public interface DebeziumSqlserverComponentBuilderFactory {
          * properties needed by Debezium engine, for example setting
          * KafkaOffsetBackingStore), the properties have to be prefixed with
          * additionalProperties.. E.g:
-         * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+         * additionalProperties.transactional.id=12345&amp;additionalProperties.schema.registry.url=http://localhost:8811/avro.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: common
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java
index fcfc046..1fdb4cb 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java
@@ -234,8 +234,8 @@ public interface DockerComponentBuilderFactory {
         /**
          * Additional configuration parameters as key/value pairs.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java
index 55b4395..d5a9af8 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java
@@ -235,8 +235,8 @@ public interface EhcacheComponentBuilderFactory {
         /**
          * A map of cache configuration to be used to create caches.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * org.ehcache.config.CacheConfiguration></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * org.ehcache.config.CacheConfiguration&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java
index 26293eb..1d09f81 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java
@@ -174,7 +174,8 @@ public interface GoogleCalendarStreamComponentBuilderFactory {
          * have to a user account. See
          * https://developers.google.com/calendar/auth for more info.
          * 
-         * The option is a: <code>java.util.List<java.lang.String></code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: consumer
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java
index 4f854ef..a50f458 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java
@@ -90,7 +90,8 @@ public interface GoogleDriveComponentBuilderFactory {
          * have to a user account. See
          * https://developers.google.com/drive/web/scopes for more info.
          * 
-         * The option is a: <code>java.util.List<java.lang.String></code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: common
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
index a5283f7..9e8985d 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
@@ -161,7 +161,8 @@ public interface GoogleSheetsStreamComponentBuilderFactory {
          * https://developers.google.com/identity/protocols/googlescopes for
          * more info.
          * 
-         * The option is a: <code>java.util.List<java.lang.String></code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: consumer
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java
index 74a98c6..89afb24 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java
@@ -87,7 +87,8 @@ public interface GuavaEventbusComponentBuilderFactory {
          * creating multi-event listeners and for handling DeadEvent properly.
          * This option cannot be used together with eventClass option.
          * 
-         * The option is a: <code>java.lang.Class<java.lang.Object></code> type.
+         * The option is a: <code>java.lang.Class&lt;java.lang.Object&gt;</code>
+         * type.
          * 
          * Group: consumer
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java
index 3135b5f..ce3f86a 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java
@@ -376,8 +376,8 @@ public interface InfinispanComponentBuilderFactory {
         /**
          * Implementation specific properties for the CacheManager.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
index 79cad94..67e1601 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
@@ -53,7 +53,8 @@ public interface JcloudsComponentBuilderFactory {
          * blobstore.
          * 
          * The option is a:
-         * <code>java.util.List<org.jclouds.blobstore.BlobStore></code> type.
+         * <code>java.util.List&lt;org.jclouds.blobstore.BlobStore&gt;</code>
+         * type.
          * 
          * Group: common
          */
@@ -67,7 +68,8 @@ public interface JcloudsComponentBuilderFactory {
          * compute.
          * 
          * The option is a:
-         * <code>java.util.List<org.jclouds.compute.ComputeService></code> type.
+         * <code>java.util.List&lt;org.jclouds.compute.ComputeService&gt;</code>
+         * type.
          * 
          * Group: common
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
index b7808fa..ae0a31b 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
@@ -384,8 +384,8 @@ public interface JettyComponentBuilderFactory {
          * A map which contains general HTTP connector properties. Uses the same
          * principle as sslSocketConnectorProperties.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: security
          */
@@ -398,8 +398,8 @@ public interface JettyComponentBuilderFactory {
          * A map which contains per port number specific HTTP connectors. Uses
          * the same principle as sslSocketConnectors.
          * 
-         * The option is a: <code>java.util.Map<java.lang.Integer,
-         * org.eclipse.jetty.server.Connector></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.Integer,
+         * org.eclipse.jetty.server.Connector&gt;</code> type.
          * 
          * Group: security
          */
@@ -451,8 +451,8 @@ public interface JettyComponentBuilderFactory {
         /**
          * A map which contains general SSL connector properties.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: security
          */
@@ -464,8 +464,8 @@ public interface JettyComponentBuilderFactory {
         /**
          * A map which contains per port number specific SSL connectors.
          * 
-         * The option is a: <code>java.util.Map<java.lang.Integer,
-         * org.eclipse.jetty.server.Connector></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.Integer,
+         * org.eclipse.jetty.server.Connector&gt;</code> type.
          * 
          * Group: security
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsltComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsltComponentBuilderFactory.java
index 64cc7ef..71f9418 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsltComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsltComponentBuilderFactory.java
@@ -104,7 +104,7 @@ public interface JsltComponentBuilderFactory {
          * JSLT can be extended by plugging in functions written in Java.
          * 
          * The option is a:
-         * <code>java.util.Collection<com.schibsted.spt.data.jslt.Function></code> type.
+         * <code>java.util.Collection&lt;com.schibsted.spt.data.jslt.Function&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java
index e354ddf..2613d15 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java
@@ -52,10 +52,10 @@ public interface KafkaComponentBuilderFactory {
          * configurations (e.g: new Kafka properties that are not reflected yet
          * in Camel configurations), the properties have to be prefixed with
          * additionalProperties.. E.g:
-         * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+         * additionalProperties.transactional.id=12345&amp;additionalProperties.schema.registry.url=http://localhost:8811/avro.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: common
          */
@@ -489,8 +489,8 @@ public interface KafkaComponentBuilderFactory {
          * autocommit.
          * 
          * The option is a:
-         * <code>org.apache.camel.spi.StateRepository<java.lang.String,
-         * java.lang.String></code> type.
+         * <code>org.apache.camel.spi.StateRepository&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          * 
          * Group: consumer
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloServerComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloServerComponentBuilderFactory.java
index f54806a..36afa3d 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloServerComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloServerComponentBuilderFactory.java
@@ -271,7 +271,7 @@ public interface MiloServerComponentBuilderFactory {
          * Security policies.
          * 
          * The option is a:
-         * <code>java.util.Set<org.eclipse.milo.opcua.stack.core.security.SecurityPolicy></code> type.
+         * <code>java.util.Set&lt;org.eclipse.milo.opcua.stack.core.security.SecurityPolicy&gt;</code> type.
          * 
          * Group: security
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java
index c28c5fa..4eee983 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java
@@ -366,7 +366,7 @@ public interface MinaComponentBuilderFactory {
          * You can set a list of Mina IoFilters to use.
          * 
          * The option is a:
-         * <code>java.util.List<org.apache.mina.core.filterchain.IoFilter></code> type.
+         * <code>java.util.List&lt;org.apache.mina.core.filterchain.IoFilter&gt;</code> type.
          * 
          * Group: codec
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
index ae53541..7411a82 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
@@ -673,8 +673,8 @@ public interface NettyComponentBuilderFactory {
          * child.keepAlive=false. See the Netty documentation for possible
          * options that can be used.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */
@@ -831,7 +831,8 @@ public interface NettyComponentBuilderFactory {
          * lookup.
          * 
          * The option is a:
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          * 
          * Group: codec
          */
@@ -862,7 +863,8 @@ public interface NettyComponentBuilderFactory {
          * lookup.
          * 
          * The option is a:
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          * 
          * Group: codec
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java
index 4e032b8..2cf36fb 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java
@@ -708,8 +708,8 @@ public interface NettyHttpComponentBuilderFactory {
          * child.keepAlive=false. See the Netty documentation for possible
          * options that can be used.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */
@@ -868,7 +868,8 @@ public interface NettyHttpComponentBuilderFactory {
          * lookup.
          * 
          * The option is a:
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          * 
          * Group: codec
          */
@@ -899,7 +900,8 @@ public interface NettyHttpComponentBuilderFactory {
          * lookup.
          * 
          * The option is a:
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          * 
          * Group: codec
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo2ComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo2ComponentBuilderFactory.java
index 2328062..ea07db0 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo2ComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo2ComponentBuilderFactory.java
@@ -139,8 +139,8 @@ public interface Olingo2ComponentBuilderFactory {
          * Custom HTTP headers to inject into every request, this could include
          * OAuth tokens, etc.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          * 
          * Group: common
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo4ComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo4ComponentBuilderFactory.java
index 907da902..3bb1a60 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo4ComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo4ComponentBuilderFactory.java
@@ -106,8 +106,8 @@ public interface Olingo4ComponentBuilderFactory {
          * Custom HTTP headers to inject into every request, this could include
          * OAuth tokens, etc.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          * 
          * Group: common
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RabbitmqComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RabbitmqComponentBuilderFactory.java
index c3c3dad..e74a395 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RabbitmqComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RabbitmqComponentBuilderFactory.java
@@ -385,8 +385,8 @@ public interface RabbitmqComponentBuilderFactory {
          * Map of additional headers. These headers will be set only when the
          * 'allowCustomHeaders' is set to true.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: producer
          */
@@ -402,8 +402,8 @@ public interface RabbitmqComponentBuilderFactory {
          * Any other keys will be ignored. When the message already contains
          * these headers they will be given precedence over these properties.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: producer
          */
@@ -557,8 +557,8 @@ public interface RabbitmqComponentBuilderFactory {
          * argument:
          * http://localhost:5672/exchange/queueargs=arg.queue.x-message-ttl=60000.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */
@@ -620,8 +620,8 @@ public interface RabbitmqComponentBuilderFactory {
          * Connection client properties (client info used in negotiating with
          * the server).
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
index a54c404..4b810bb 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
@@ -63,8 +63,8 @@ public interface SalesforceComponentBuilderFactory {
         /**
          * Query params for APEX method.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: common
          */
@@ -233,8 +233,8 @@ public interface SalesforceComponentBuilderFactory {
         /**
          * Replay IDs to start from per channel name.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Long></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Long&gt;</code> type.
          * 
          * Group: common
          */
@@ -602,8 +602,8 @@ public interface SalesforceComponentBuilderFactory {
          * HTTP client. Have a look at properties of SalesforceHttpClient and
          * the Jetty HttpClient for all available options.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: common (advanced)
          */
@@ -617,8 +617,8 @@ public interface SalesforceComponentBuilderFactory {
          * LongPollingTransport used by the BayeuxClient (CometD) used by the
          * streaming api.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: common (advanced)
          */
@@ -711,7 +711,8 @@ public interface SalesforceComponentBuilderFactory {
         /**
          * A list of addresses for which HTTP proxy server should not be used.
          * 
-         * The option is a: <code>java.util.Set<java.lang.String></code> type.
+         * The option is a: <code>java.util.Set&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: proxy
          */
@@ -735,7 +736,8 @@ public interface SalesforceComponentBuilderFactory {
         /**
          * A list of addresses for which HTTP proxy server should be used.
          * 
-         * The option is a: <code>java.util.Set<java.lang.String></code> type.
+         * The option is a: <code>java.util.Set&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: proxy
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java
index 53f5dfb..a1360ca 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java
@@ -170,7 +170,7 @@ public interface SedaComponentBuilderFactory {
          * Sets the default queue factory.
          * 
          * The option is a:
-         * <code>org.apache.camel.component.seda.BlockingQueueFactory<org.apache.camel.Exchange></code> type.
+         * <code>org.apache.camel.component.seda.BlockingQueueFactory&lt;org.apache.camel.Exchange&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServicenowComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServicenowComponentBuilderFactory.java
index 07ab0dd..705312f 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServicenowComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServicenowComponentBuilderFactory.java
@@ -235,8 +235,8 @@ public interface ServicenowComponentBuilderFactory {
         /**
          * Defines both request and response models.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Class<java.lang.Object>></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Class&lt;java.lang.Object&gt;&gt;</code> type.
          * 
          * Group: producer
          */
@@ -277,8 +277,8 @@ public interface ServicenowComponentBuilderFactory {
         /**
          * Defines the request model.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Class<java.lang.Object>></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Class&lt;java.lang.Object&gt;&gt;</code> type.
          * 
          * Group: producer
          */
@@ -302,8 +302,8 @@ public interface ServicenowComponentBuilderFactory {
         /**
          * Defines the response model.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Class<java.lang.Object>></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Class&lt;java.lang.Object&gt;&gt;</code> type.
          * 
          * Group: producer
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java
index aa6e93f..1d8a4f2 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java
@@ -554,8 +554,8 @@ public interface SmppComponentBuilderFactory {
          * These headers will be passed to the proxy server while establishing
          * the connection.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          * 
          * Group: proxy
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java
index b6cb69a..af25335 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java
@@ -555,8 +555,8 @@ public interface SmppsComponentBuilderFactory {
          * These headers will be passed to the proxy server while establishing
          * the connection.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          * 
          * Group: proxy
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StubComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StubComponentBuilderFactory.java
index 9c26f0a..e8b104c 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StubComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StubComponentBuilderFactory.java
@@ -169,7 +169,7 @@ public interface StubComponentBuilderFactory {
          * Sets the default queue factory.
          * 
          * The option is a:
-         * <code>org.apache.camel.component.seda.BlockingQueueFactory<org.apache.camel.Exchange></code> type.
+         * <code>org.apache.camel.component.seda.BlockingQueueFactory&lt;org.apache.camel.Exchange&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxKafkaComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxKafkaComponentBuilderFactory.java
index 524cd2a..3e122a7 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxKafkaComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxKafkaComponentBuilderFactory.java
@@ -56,10 +56,10 @@ public interface VertxKafkaComponentBuilderFactory {
          * configurations (e.g: new Kafka properties that are not reflected yet
          * in Camel configurations), the properties have to be prefixed with
          * additionalProperties.. E.g:
-         * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro.
+         * additionalProperties.transactional.id=12345&amp;additionalProperties.schema.registry.url=http://localhost:8811/avro.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: common
          */
@@ -72,8 +72,8 @@ public interface VertxKafkaComponentBuilderFactory {
          * A list of host/port pairs to use for establishing the initial
          * connection to the Kafka cluster. The client will make use of all
          * servers irrespective of which servers are specified here for
-         * bootstrapping&mdash;this list only impacts the initial hosts used to
-         * discover the full set of servers. This list should be in the form
+         * bootstrapping&amp;mdash;this list only impacts the initial hosts used
+         * to discover the full set of servers. This list should be in the form
          * host1:port1,host2:port2,.... Since these servers are just used for
          * the initial connection to discover the full cluster membership (which
          * may change dynamically), this list need not contain the full set of
@@ -956,11 +956,11 @@ public interface VertxKafkaComponentBuilderFactory {
          * sent out. However in some circumstances the client may want to reduce
          * the number of requests even under moderate load. This setting
          * accomplishes this by adding a small amount of artificial
-         * delay&mdash;that is, rather than immediately sending out a record the
-         * producer will wait for up to the given delay to allow other records
-         * to be sent so that the sends can be batched together. This can be
-         * thought of as analogous to Nagle's algorithm in TCP. This setting
-         * gives the upper bound on the delay for batching: once we get
+         * delay&amp;mdash;that is, rather than immediately sending out a record
+         * the producer will wait for up to the given delay to allow other
+         * records to be sent so that the sends can be batched together. This
+         * can be thought of as analogous to Nagle's algorithm in TCP. This
+         * setting gives the upper bound on the delay for batching: once we get
          * batch.size worth of records for a partition it will be sent
          * immediately regardless of this setting, however if we have fewer than
          * this many bytes accumulated for this partition we will 'linger' for
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VmComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VmComponentBuilderFactory.java
index 96401dd..e2ccbb7 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VmComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VmComponentBuilderFactory.java
@@ -167,7 +167,7 @@ public interface VmComponentBuilderFactory {
          * Sets the default queue factory.
          * 
          * The option is a:
-         * <code>org.apache.camel.component.seda.BlockingQueueFactory<org.apache.camel.Exchange></code> type.
+         * <code>org.apache.camel.component.seda.BlockingQueueFactory&lt;org.apache.camel.Exchange&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java
index 32b9fe1..3a29ae0 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java
@@ -49,7 +49,8 @@ public interface Web3jComponentBuilderFactory {
         /**
          * Contract address or a list of addresses.
          * 
-         * The option is a: <code>java.util.List<java.lang.String></code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: common
          */
@@ -124,7 +125,8 @@ public interface Web3jComponentBuilderFactory {
         /**
          * A transaction privateFor nodes with public keys in a Quorum network.
          * 
-         * The option is a: <code>java.util.List<java.lang.String></code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          * 
          * Group: common
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WordpressComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WordpressComponentBuilderFactory.java
index 40c3b5a..908c1a5 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WordpressComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WordpressComponentBuilderFactory.java
@@ -76,8 +76,8 @@ public interface WordpressComponentBuilderFactory {
         /**
          * The criteria to use with complex searches.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: common
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XjComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XjComponentBuilderFactory.java
index 81eb7dd..5f6dc83 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XjComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XjComponentBuilderFactory.java
@@ -114,8 +114,8 @@ public interface XjComponentBuilderFactory {
         /**
          * To set custom Saxon configuration properties.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
index 7408eaa..f522103 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
@@ -162,8 +162,8 @@ public interface XmlsecuritySignComponentBuilderFactory {
          * org.jcp.xml.dsig.validateManifests
          * javax.xml.crypto.dsig.cacheReference.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: producer
          */
@@ -443,7 +443,8 @@ public interface XmlsecuritySignComponentBuilderFactory {
          * the transform methods.
          * 
          * The option is a:
-         * <code>java.util.List<javax.xml.crypto.AlgorithmMethod></code> type.
+         * <code>java.util.List&lt;javax.xml.crypto.AlgorithmMethod&gt;</code>
+         * type.
          * 
          * Group: producer
          */
@@ -467,7 +468,7 @@ public interface XmlsecuritySignComponentBuilderFactory {
          * configuration.
          * 
          * The option is a:
-         * <code>java.util.List<javax.xml.crypto.dsig.spec.XPathFilterParameterSpec></code> type.
+         * <code>java.util.List&lt;javax.xml.crypto.dsig.spec.XPathFilterParameterSpec&gt;</code> type.
          * 
          * Group: producer
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
index 78d7905..ff4bd2a 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
@@ -85,8 +85,8 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
          * org.jcp.xml.dsig.validateManifests
          * javax.xml.crypto.dsig.cacheReference.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: producer
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XqueryComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XqueryComponentBuilderFactory.java
index 8885bef..aeb3201 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XqueryComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XqueryComponentBuilderFactory.java
@@ -120,8 +120,8 @@ public interface XqueryComponentBuilderFactory {
         /**
          * To set custom Saxon configuration properties.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltSaxonComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltSaxonComponentBuilderFactory.java
index 8fa9079..f9f6e1d 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltSaxonComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltSaxonComponentBuilderFactory.java
@@ -118,8 +118,8 @@ public interface XsltSaxonComponentBuilderFactory {
         /**
          * To set custom Saxon configuration properties.
          * 
-         * The option is a: <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          * 
          * Group: advanced
          */


[camel] 01/02: CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped.

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

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

commit 3633ff1bb8390622dc582fdfa475a7aa334a8270
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 14 19:04:13 2020 +0100

    CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped.
---
 .../dsl/component/ComponentDslBuilderFactoryGenerator.java    |  5 ++++-
 .../dsl/component/ComponentDslInnerBuilderGenerator.java      | 11 +++++++----
 .../dsl/component/ComponentsBuilderFactoryGenerator.java      |  6 +++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
index 6640ba1..05d22d3 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
@@ -138,6 +138,9 @@ public final class ComponentDslBuilderFactoryGenerator {
             method.addAnnotation(Deprecated.class);
         }
 
-        method.getJavaDoc().setFullText(DslHelper.getMainDescriptionWithoutPathOptions(componentModel));
+        String doc = DslHelper.getMainDescriptionWithoutPathOptions(componentModel);
+        // must xml encode description as in some rare cases it contains & chars which is invalid javadoc
+        doc = JavadocHelper.xmlEncode(doc);
+        method.getJavaDoc().setText(doc);
     }
 }
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
index 5271019..dbb3db1 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
@@ -18,6 +18,7 @@ package org.apache.camel.maven.packaging.dsl.component;
 
 import org.apache.camel.maven.packaging.dsl.DslHelper;
 import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.util.JavadocHelper;
 import org.apache.camel.tooling.util.srcgen.JavaClass;
 import org.apache.camel.tooling.util.srcgen.Method;
 import org.apache.commons.lang3.StringUtils;
@@ -81,24 +82,26 @@ public final class ComponentDslInnerBuilderGenerator {
             if (componentOptionModel.isDeprecated()) {
                 method.addAnnotation(Deprecated.class);
             }
-            method.getJavaDoc().setFullText(generateOptionDescription(componentOptionModel));
+            method.getJavaDoc().setText(generateOptionDescription(componentOptionModel));
         });
     }
 
     private String generateOptionDescription(final ComponentModel.ComponentOptionModel componentOptionModel) {
-        String desc = componentOptionModel.getDescription();
+        String desc = JavadocHelper.xmlEncode(componentOptionModel.getDescription());
         if (!desc.endsWith(".")) {
             desc += ".";
         }
         desc += "\n";
-        desc += "\nThe option is a: <code>" + componentOptionModel.getJavaType() + "</code> type.";
+        desc += "\nThe option is a: <code>" + JavadocHelper.xmlEncode(componentOptionModel.getJavaType()) + "</code> type.";
         desc += "\n";
         if ("parameter".equals(componentOptionModel.getKind()) && componentOptionModel.isRequired()) {
             desc += "\nRequired: true";
         }
         // include default value (if any)
         if (componentOptionModel.getDefaultValue() != null) {
-            desc += "\nDefault: " + componentOptionModel.getDefaultValue();
+            // must xml encode description as in some rare cases it contains & chars which is invalid javadoc
+            String text = JavadocHelper.xmlEncode(componentOptionModel.getDefaultValue().toString());
+            desc += "\nDefault: " + text;
         }
         desc += "\nGroup: " + componentOptionModel.getGroup();
 
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
index 64ef599..f420e3d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
@@ -25,6 +25,7 @@ import org.apache.camel.maven.packaging.AbstractGeneratorMojo;
 import org.apache.camel.maven.packaging.ComponentDslMojo;
 import org.apache.camel.maven.packaging.dsl.DslHelper;
 import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.util.JavadocHelper;
 import org.apache.camel.tooling.util.srcgen.JavaClass;
 import org.apache.camel.tooling.util.srcgen.Method;
 
@@ -121,7 +122,10 @@ public final class ComponentsBuilderFactoryGenerator {
                 componentEntryMethod.addAnnotation(Deprecated.class);
             }
 
-            componentEntryMethod.getJavaDoc().setFullText(DslHelper.getMainDescriptionWithoutPathOptions(componentModel));
+            String doc = DslHelper.getMainDescriptionWithoutPathOptions(componentModel);
+            // must xml encode description as in some rare cases it contains & chars which is invalid javadoc
+            doc = JavadocHelper.xmlEncode(doc);
+            componentEntryMethod.getJavaDoc().setText(doc);
         });
     }
 }