You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2019/06/11 16:15:57 UTC

[camel] 04/05: Fix enum generation and put around the type in javadoc

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

gnodet pushed a commit to branch endpoint-dsl
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 7b8c3ac42acc079bc2daf37da0ab51e98b846ab6
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Jun 11 17:53:28 2019 +0200

    Fix enum generation and put <code> around the type in javadoc
---
 .../camel/model/endpoint/AMQPEndpointBuilder.java  | 407 ++++++++-------
 .../camel/model/endpoint/AS2EndpointBuilder.java   | 120 +++--
 .../model/endpoint/ActiveMQEndpointBuilder.java    | 407 ++++++++-------
 .../camel/model/endpoint/AhcEndpointBuilder.java   |  74 +--
 .../camel/model/endpoint/ApnsEndpointBuilder.java  | 103 ++--
 .../model/endpoint/AsteriskEndpointBuilder.java    |  36 +-
 .../camel/model/endpoint/AtmosEndpointBuilder.java |  57 ++-
 .../AtmosphereWebsocketEndpointBuilder.java        | 111 +++--
 .../camel/model/endpoint/AtomEndpointBuilder.java  | 130 ++---
 .../model/endpoint/AtomixMapEndpointBuilder.java   |  98 ++--
 .../endpoint/AtomixMessagingEndpointBuilder.java   | 104 ++--
 .../endpoint/AtomixMultiMapEndpointBuilder.java    |  98 ++--
 .../model/endpoint/AtomixQueueEndpointBuilder.java |  90 ++--
 .../model/endpoint/AtomixSetEndpointBuilder.java   |  93 ++--
 .../model/endpoint/AtomixValueEndpointBuilder.java |  95 ++--
 .../camel/model/endpoint/AvroEndpointBuilder.java  |  61 ++-
 .../camel/model/endpoint/BeanEndpointBuilder.java  |  26 +-
 .../endpoint/BeanValidatorEndpointBuilder.java     |  32 +-
 .../model/endpoint/BeanstalkEndpointBuilder.java   | 141 +++---
 .../model/endpoint/BlobServiceEndpointBuilder.java |  85 ++--
 .../model/endpoint/BonitaEndpointBuilder.java      |  40 +-
 .../camel/model/endpoint/BoxEndpointBuilder.java   |  87 ++--
 .../model/endpoint/BraintreeEndpointBuilder.java   |  59 +--
 .../model/endpoint/BrowseEndpointBuilder.java      |  24 +-
 .../camel/model/endpoint/CMEndpointBuilder.java    |  26 +-
 .../camel/model/endpoint/CMISEndpointBuilder.java  |  66 +--
 .../endpoint/CaffeineCacheEndpointBuilder.java     |  95 ++--
 .../endpoint/CaffeineLoadCacheEndpointBuilder.java |  95 ++--
 .../model/endpoint/CassandraEndpointBuilder.java   | 150 +++---
 .../model/endpoint/ChatScriptEndpointBuilder.java  |  24 +-
 .../camel/model/endpoint/ChunkEndpointBuilder.java |  33 +-
 .../model/endpoint/CinderEndpointBuilder.java      |  35 +-
 .../camel/model/endpoint/ClassEndpointBuilder.java |  26 +-
 .../model/endpoint/ClientEndpointBuilder.java      | 107 ++--
 .../camel/model/endpoint/CoAPEndpointBuilder.java  |  60 ++-
 .../model/endpoint/CometdEndpointBuilder.java      |  78 +--
 .../model/endpoint/ConsulEndpointBuilder.java      |  24 +-
 .../model/endpoint/ControlBusEndpointBuilder.java  |  32 +-
 .../camel/model/endpoint/CordaEndpointBuilder.java |  28 +-
 .../model/endpoint/CouchDbEndpointBuilder.java     |  62 +--
 .../model/endpoint/CouchbaseEndpointBuilder.java   | 226 +++++----
 .../model/endpoint/CryptoCmsEndpointBuilder.java   |  77 +--
 .../camel/model/endpoint/CwEndpointBuilder.java    |  46 +-
 .../camel/model/endpoint/CxfEndpointBuilder.java   | 147 +++---
 .../camel/model/endpoint/CxfRsEndpointBuilder.java | 145 +++---
 .../model/endpoint/DataFormatEndpointBuilder.java  |  13 +-
 .../model/endpoint/DataSetEndpointBuilder.java     |  80 +--
 .../model/endpoint/DataSetTestEndpointBuilder.java |  70 +--
 .../camel/model/endpoint/DdbEndpointBuilder.java   |  56 ++-
 .../model/endpoint/DdbStreamEndpointBuilder.java   | 133 ++---
 .../endpoint/DigitalOceanEndpointBuilder.java      |  51 +-
 .../endpoint/DigitalSignatureEndpointBuilder.java  |  80 +--
 .../model/endpoint/DirectEndpointBuilder.java      |  41 +-
 .../model/endpoint/DirectVmEndpointBuilder.java    |  50 +-
 .../model/endpoint/DisruptorEndpointBuilder.java   |  60 ++-
 .../model/endpoint/DisruptorVmEndpointBuilder.java |  60 ++-
 .../camel/model/endpoint/DnsEndpointBuilder.java   |  12 +-
 .../model/endpoint/DockerEndpointBuilder.java      |  95 ++--
 .../camel/model/endpoint/DozerEndpointBuilder.java |  26 +-
 .../camel/model/endpoint/DrillEndpointBuilder.java |  26 +-
 .../model/endpoint/DropboxEndpointBuilder.java     |  53 +-
 .../camel/model/endpoint/EC2EndpointBuilder.java   |  34 +-
 .../camel/model/endpoint/ECSEndpointBuilder.java   |  33 +-
 .../camel/model/endpoint/EKSEndpointBuilder.java   |  33 +-
 .../model/endpoint/EhcacheEndpointBuilder.java     |  83 ++--
 .../camel/model/endpoint/EjbEndpointBuilder.java   |  26 +-
 .../endpoint/ElasticsearchEndpointBuilder.java     |  57 ++-
 .../camel/model/endpoint/ElsqlEndpointBuilder.java | 217 ++++----
 .../camel/model/endpoint/EtcdEndpointBuilder.java  | 146 +++---
 .../model/endpoint/EventAdminEndpointBuilder.java  |  31 +-
 .../camel/model/endpoint/EventEndpointBuilder.java |  24 +-
 .../camel/model/endpoint/ExecEndpointBuilder.java  |  37 +-
 .../model/endpoint/FacebookEndpointBuilder.java    | 376 +++++++-------
 .../camel/model/endpoint/FhirEndpointBuilder.java  | 128 ++---
 .../camel/model/endpoint/FileEndpointBuilder.java  | 407 ++++++++-------
 .../model/endpoint/FlatpackEndpointBuilder.java    | 132 ++---
 .../camel/model/endpoint/FlinkEndpointBuilder.java |  38 +-
 .../camel/model/endpoint/FopEndpointBuilder.java   |  19 +-
 .../model/endpoint/FreemarkerEndpointBuilder.java  |  25 +-
 .../camel/model/endpoint/FtpEndpointBuilder.java   | 500 ++++++++++---------
 .../camel/model/endpoint/FtpsEndpointBuilder.java  | 553 +++++++++++----------
 .../model/endpoint/GangliaEndpointBuilder.java     |  71 +--
 .../model/endpoint/GeoCoderEndpointBuilder.java    |  48 +-
 .../camel/model/endpoint/GitEndpointBuilder.java   |  55 +-
 .../model/endpoint/GitHubEndpointBuilder.java      |  49 +-
 .../model/endpoint/GlanceEndpointBuilder.java      |  32 +-
 .../endpoint/GoogleBigQueryEndpointBuilder.java    |  25 +-
 .../endpoint/GoogleBigQuerySQLEndpointBuilder.java |  18 +-
 .../endpoint/GoogleCalendarEndpointBuilder.java    |  50 +-
 .../GoogleCalendarStreamEndpointBuilder.java       | 141 +++---
 .../model/endpoint/GoogleDriveEndpointBuilder.java |  59 +--
 .../model/endpoint/GoogleMailEndpointBuilder.java  |  44 +-
 .../endpoint/GoogleMailStreamEndpointBuilder.java  | 130 ++---
 .../endpoint/GooglePubsubEndpointBuilder.java      |  45 +-
 .../endpoint/GoogleSheetsEndpointBuilder.java      |  45 +-
 .../GoogleSheetsStreamEndpointBuilder.java         | 136 ++---
 .../camel/model/endpoint/GoraEndpointBuilder.java  | 106 ++--
 .../camel/model/endpoint/GrapeEndpointBuilder.java |  10 +-
 .../model/endpoint/GridFsEndpointBuilder.java      |  68 +--
 .../camel/model/endpoint/GrpcEndpointBuilder.java  | 109 ++--
 .../endpoint/GuavaEventBusEndpointBuilder.java     |  33 +-
 .../camel/model/endpoint/HBaseEndpointBuilder.java |  85 ++--
 .../HazelcastAtomicnumberEndpointBuilder.java      |  51 +-
 .../endpoint/HazelcastInstanceEndpointBuilder.java |  83 ++--
 .../endpoint/HazelcastListEndpointBuilder.java     |  83 ++--
 .../endpoint/HazelcastMapEndpointBuilder.java      |  83 ++--
 .../endpoint/HazelcastMultimapEndpointBuilder.java |  83 ++--
 .../endpoint/HazelcastQueueEndpointBuilder.java    |  83 ++--
 .../HazelcastReplicatedmapEndpointBuilder.java     |  83 ++--
 .../HazelcastRingbufferEndpointBuilder.java        |  51 +-
 .../endpoint/HazelcastSedaEndpointBuilder.java     |  83 ++--
 .../endpoint/HazelcastSetEndpointBuilder.java      |  83 ++--
 .../endpoint/HazelcastTopicEndpointBuilder.java    |  83 ++--
 .../camel/model/endpoint/HdfsEndpointBuilder.java  | 204 ++++----
 .../model/endpoint/HipchatEndpointBuilder.java     | 115 +++--
 .../camel/model/endpoint/HttpEndpointBuilder.java  | 220 ++++----
 .../camel/model/endpoint/IAMEndpointBuilder.java   |  34 +-
 .../camel/model/endpoint/IOTAEndpointBuilder.java  |  45 +-
 .../camel/model/endpoint/IPFSEndpointBuilder.java  |  15 +-
 .../model/endpoint/IgniteCacheEndpointBuilder.java |  76 +--
 .../endpoint/IgniteComputeEndpointBuilder.java     |  43 +-
 .../endpoint/IgniteEventsEndpointBuilder.java      |  46 +-
 .../model/endpoint/IgniteIdGenEndpointBuilder.java |  37 +-
 .../endpoint/IgniteMessagingEndpointBuilder.java   |  50 +-
 .../model/endpoint/IgniteQueueEndpointBuilder.java |  39 +-
 .../model/endpoint/IgniteSetEndpointBuilder.java   |  32 +-
 .../model/endpoint/InfinispanEndpointBuilder.java  |  92 ++--
 .../model/endpoint/InfluxDbEndpointBuilder.java    |  22 +-
 .../camel/model/endpoint/IrcEndpointBuilder.java   | 133 ++---
 .../model/endpoint/IronMQEndpointBuilder.java      | 145 +++---
 .../camel/model/endpoint/JBPMEndpointBuilder.java  | 135 ++---
 .../model/endpoint/JCacheEndpointBuilder.java      | 110 ++--
 .../model/endpoint/JGroupsEndpointBuilder.java     |  30 +-
 .../model/endpoint/JGroupsRaftEndpointBuilder.java |  31 +-
 .../camel/model/endpoint/JMXEndpointBuilder.java   | 128 ++---
 .../endpoint/JSR356WebSocketEndpointBuilder.java   |  30 +-
 .../model/endpoint/JcloudsEndpointBuilder.java     |  63 +--
 .../camel/model/endpoint/JcrEndpointBuilder.java   |  67 +--
 .../camel/model/endpoint/JdbcEndpointBuilder.java  |  66 +--
 .../model/endpoint/JettyHttpEndpointBuilder9.java  | 252 +++++-----
 .../camel/model/endpoint/JingEndpointBuilder.java  |  15 +-
 .../camel/model/endpoint/JiraEndpointBuilder.java  |  56 ++-
 .../camel/model/endpoint/JmsEndpointBuilder.java   | 407 ++++++++-------
 .../camel/model/endpoint/JoltEndpointBuilder.java  |  32 +-
 .../camel/model/endpoint/JooqEndpointBuilder.java  | 115 +++--
 .../camel/model/endpoint/JpaEndpointBuilder.java   | 200 ++++----
 .../endpoint/JsonValidatorEndpointBuilder.java     |  36 +-
 .../camel/model/endpoint/Jt400EndpointBuilder.java | 176 ++++---
 .../camel/model/endpoint/KMSEndpointBuilder.java   |  32 +-
 .../camel/model/endpoint/KafkaEndpointBuilder.java | 366 +++++++-------
 .../model/endpoint/KeystoneEndpointBuilder.java    |  32 +-
 .../model/endpoint/KinesisEndpointBuilder.java     | 140 +++---
 .../endpoint/KinesisFirehoseEndpointBuilder.java   |  29 +-
 .../KubernetesConfigMapsEndpointBuilder.java       |  68 +--
 .../KubernetesDeploymentsEndpointBuilder.java      |  95 ++--
 .../endpoint/KubernetesHPAEndpointBuilder.java     |  95 ++--
 .../endpoint/KubernetesJobEndpointBuilder.java     |  95 ++--
 .../KubernetesNamespacesEndpointBuilder.java       |  95 ++--
 .../endpoint/KubernetesNodesEndpointBuilder.java   |  95 ++--
 ...etesPersistentVolumesClaimsEndpointBuilder.java |  68 +--
 ...KubernetesPersistentVolumesEndpointBuilder.java |  68 +--
 .../endpoint/KubernetesPodsEndpointBuilder.java    |  95 ++--
 ...netesReplicationControllersEndpointBuilder.java |  95 ++--
 .../KubernetesResourcesQuotaEndpointBuilder.java   |  68 +--
 .../endpoint/KubernetesSecretsEndpointBuilder.java |  68 +--
 .../KubernetesServiceAccountsEndpointBuilder.java  |  68 +--
 .../KubernetesServicesEndpointBuilder.java         |  95 ++--
 .../model/endpoint/LambdaEndpointBuilder.java      |  37 +-
 .../model/endpoint/LanguageEndpointBuilder.java    |  33 +-
 .../camel/model/endpoint/LdapEndpointBuilder.java  |  23 +-
 .../camel/model/endpoint/LdifEndpointBuilder.java  |  10 +-
 .../model/endpoint/LinkedInEndpointBuilder.java    |  80 +--
 .../camel/model/endpoint/LogEndpointBuilder.java   | 129 ++---
 .../model/endpoint/LuceneEndpointBuilder.java      |  34 +-
 .../model/endpoint/LumberjackEndpointBuilder.java  |  34 +-
 .../camel/model/endpoint/MQEndpointBuilder.java    |  34 +-
 .../camel/model/endpoint/MQTTEndpointBuilder.java  | 159 +++---
 .../camel/model/endpoint/MSKEndpointBuilder.java   |  33 +-
 .../camel/model/endpoint/MailEndpointBuilder.java  | 281 ++++++-----
 .../model/endpoint/MasterEndpointBuilder.java      |  26 +-
 .../model/endpoint/MetricsEndpointBuilder.java     |  47 +-
 .../model/endpoint/MicrometerEndpointBuilder.java  |  34 +-
 .../model/endpoint/MiloClientEndpointBuilder.java  | 111 +++--
 .../model/endpoint/MiloServerEndpointBuilder.java  |  24 +-
 .../camel/model/endpoint/Mina2EndpointBuilder.java | 132 ++---
 .../camel/model/endpoint/MllpEndpointBuilder.java  | 130 ++---
 .../camel/model/endpoint/MockEndpointBuilder.java  |  54 +-
 .../model/endpoint/MongoDbEndpointBuilder.java     |  78 +--
 .../camel/model/endpoint/MsvEndpointBuilder.java   |  50 +-
 .../model/endpoint/MustacheEndpointBuilder.java    |  21 +-
 .../camel/model/endpoint/MvelEndpointBuilder.java  |  17 +-
 .../model/endpoint/MyBatisBeanEndpointBuilder.java |  23 +-
 .../model/endpoint/MyBatisEndpointBuilder.java     | 138 ++---
 .../model/endpoint/NagiosEndpointBuilder.java      |  44 +-
 .../camel/model/endpoint/NatsEndpointBuilder.java  | 119 +++--
 .../model/endpoint/NetWeaverEndpointBuilder.java   |  29 +-
 .../camel/model/endpoint/NettyEndpointBuilder.java | 338 +++++++------
 .../model/endpoint/NettyHttpEndpointBuilder.java   | 374 +++++++-------
 .../model/endpoint/NeutronEndpointBuilder.java     |  35 +-
 .../camel/model/endpoint/NovaEndpointBuilder.java  |  35 +-
 .../camel/model/endpoint/NsqEndpointBuilder.java   |  83 ++--
 .../model/endpoint/Olingo2EndpointBuilder.java     |  73 +--
 .../model/endpoint/Olingo4EndpointBuilder.java     |  73 +--
 .../OpenshiftBuildConfigsEndpointBuilder.java      |  68 +--
 .../endpoint/OpenshiftBuildsEndpointBuilder.java   |  68 +--
 .../model/endpoint/OptaPlannerEndpointBuilder.java |  34 +-
 .../camel/model/endpoint/PahoEndpointBuilder.java  |  66 +--
 .../model/endpoint/PaxLoggingEndpointBuilder.java  |  24 +-
 .../camel/model/endpoint/PdfEndpointBuilder.java   |  52 +-
 .../model/endpoint/PgEventEndpointBuilder.java     |  44 +-
 .../model/endpoint/PrinterEndpointBuilder.java     |  52 +-
 .../model/endpoint/PropertiesEndpointBuilder.java  |  37 +-
 .../model/endpoint/PubNubEndpointBuilder.java      |  55 +-
 .../model/endpoint/PulsarEndpointBuilder.java      |  53 +-
 .../model/endpoint/QuartzEndpointBuilder.java      |  94 ++--
 .../endpoint/QueueServiceEndpointBuilder.java      |  51 +-
 .../model/endpoint/QuickfixjEndpointBuilder.java   |  33 +-
 .../model/endpoint/RabbitMQEndpointBuilder.java    | 254 +++++-----
 .../endpoint/ReactiveStreamsEndpointBuilder.java   |  50 +-
 .../camel/model/endpoint/RedisEndpointBuilder.java |  61 +--
 .../camel/model/endpoint/RefEndpointBuilder.java   |  24 +-
 .../model/endpoint/RestApiEndpointBuilder.java     |  32 +-
 .../camel/model/endpoint/RestEndpointBuilder.java  |  55 +-
 .../model/endpoint/RestSwaggerEndpointBuilder.java |  25 +-
 .../model/endpoint/RestletEndpointBuilder.java     |  99 ++--
 .../camel/model/endpoint/RssEndpointBuilder.java   | 130 ++---
 .../camel/model/endpoint/S3EndpointBuilder.java    | 231 +++++----
 .../camel/model/endpoint/SWFEndpointBuilder.java   | 117 +++--
 .../camel/model/endpoint/SagaEndpointBuilder.java  |  18 +-
 .../model/endpoint/SalesforceEndpointBuilder.java  | 189 +++----
 .../model/endpoint/SchedulerEndpointBuilder.java   | 106 ++--
 .../model/endpoint/SchematronEndpointBuilder.java  |  25 +-
 .../camel/model/endpoint/ScpEndpointBuilder.java   | 101 ++--
 .../camel/model/endpoint/SdbEndpointBuilder.java   |  43 +-
 .../camel/model/endpoint/SedaEndpointBuilder.java  |  86 ++--
 .../model/endpoint/ServerEndpointBuilder.java      | 111 +++--
 .../model/endpoint/ServiceEndpointBuilder.java     |  24 +-
 .../model/endpoint/ServiceNowEndpointBuilder.java  | 183 ++++---
 .../model/endpoint/ServletEndpointBuilder.java     | 103 ++--
 .../camel/model/endpoint/SesEndpointBuilder.java   |  41 +-
 .../camel/model/endpoint/SftpEndpointBuilder.java  | 527 +++++++++++---------
 .../camel/model/endpoint/SipEndpointBuilder.java   | 176 +++----
 .../camel/model/endpoint/Sjms2EndpointBuilder.java | 170 ++++---
 .../model/endpoint/SjmsBatchEndpointBuilder.java   | 112 +++--
 .../camel/model/endpoint/SjmsEndpointBuilder.java  | 158 +++---
 .../camel/model/endpoint/SlackEndpointBuilder.java | 121 +++--
 .../camel/model/endpoint/SmppEndpointBuilder.java  | 171 ++++---
 .../camel/model/endpoint/SnmpEndpointBuilder.java  | 160 +++---
 .../camel/model/endpoint/SnsEndpointBuilder.java   |  64 +--
 .../camel/model/endpoint/SolrEndpointBuilder.java  |  57 ++-
 .../model/endpoint/SoroushBotEndpointBuilder.java  | 103 ++--
 .../camel/model/endpoint/SparkEndpointBuilder.java |  56 ++-
 .../model/endpoint/SplunkEndpointBuilder.java      | 176 ++++---
 .../model/endpoint/SpringBatchEndpointBuilder.java |  27 +-
 .../endpoint/SpringIntegrationEndpointBuilder.java |  37 +-
 .../model/endpoint/SpringLdapEndpointBuilder.java  |  20 +-
 .../endpoint/SpringWebserviceEndpointBuilder.java  | 119 ++---
 .../camel/model/endpoint/SqlEndpointBuilder.java   | 203 ++++----
 .../model/endpoint/SqlStoredEndpointBuilder.java   |  35 +-
 .../camel/model/endpoint/SqsEndpointBuilder.java   | 234 +++++----
 .../camel/model/endpoint/SshEndpointBuilder.java   | 146 +++---
 .../camel/model/endpoint/StAXEndpointBuilder.java  |  10 +-
 .../camel/model/endpoint/StompEndpointBuilder.java |  44 +-
 .../model/endpoint/StreamEndpointBuilder.java      | 103 ++--
 .../endpoint/StringTemplateEndpointBuilder.java    |  27 +-
 .../camel/model/endpoint/StubEndpointBuilder.java  |  86 ++--
 .../camel/model/endpoint/SwiftEndpointBuilder.java |  35 +-
 .../model/endpoint/TelegramEndpointBuilder.java    | 122 ++---
 .../model/endpoint/ThriftEndpointBuilder.java      |  77 +--
 .../camel/model/endpoint/TikaEndpointBuilder.java  |  27 +-
 .../camel/model/endpoint/TimerEndpointBuilder.java |  62 ++-
 .../model/endpoint/TwilioEndpointBuilder.java      |  32 +-
 .../TwitterDirectMessageEndpointBuilder.java       | 182 ++++---
 .../endpoint/TwitterSearchEndpointBuilder.java     | 182 ++++---
 .../endpoint/TwitterStreamingEndpointBuilder.java  | 188 +++----
 .../endpoint/TwitterTimelineEndpointBuilder.java   | 188 +++----
 .../model/endpoint/UndertowEndpointBuilder.java    | 104 ++--
 .../model/endpoint/ValidatorEndpointBuilder.java   |  50 +-
 .../model/endpoint/VelocityEndpointBuilder.java    |  24 +-
 .../camel/model/endpoint/VertxEndpointBuilder.java |  29 +-
 .../camel/model/endpoint/VmEndpointBuilder.java    |  86 ++--
 .../model/endpoint/WeatherEndpointBuilder.java     | 196 ++++----
 .../camel/model/endpoint/Web3jEndpointBuilder.java | 141 +++---
 .../model/endpoint/WebhookEndpointBuilder.java     |  40 +-
 .../model/endpoint/WebsocketEndpointBuilder.java   |  95 ++--
 .../model/endpoint/WordpressEndpointBuilder.java   |  56 ++-
 .../camel/model/endpoint/WsEndpointBuilder.java    |  82 +--
 .../model/endpoint/XChangeEndpointBuilder.java     |  43 +-
 .../model/endpoint/XQueryEndpointBuilder.java      | 150 +++---
 .../endpoint/XmlSignatureEndpointBuilder.java      | 141 +++---
 .../camel/model/endpoint/XmppEndpointBuilder.java  |  87 ++--
 .../camel/model/endpoint/XsltEndpointBuilder.java  |  79 +--
 .../model/endpoint/YammerEndpointBuilder.java      | 132 ++---
 .../model/endpoint/ZendeskEndpointBuilder.java     |  39 +-
 .../model/endpoint/ZooKeeperEndpointBuilder.java   |  58 ++-
 .../endpoint/ZooKeeperMasterEndpointBuilder.java   |  26 +-
 .../camel/maven/packaging/EndpointDslMojo.java     |  10 +-
 297 files changed, 14723 insertions(+), 12233 deletions(-)

diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AMQPEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AMQPEndpointBuilder.java
index 6307a6d..649b5dd 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AMQPEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AMQPEndpointBuilder.java
@@ -41,8 +41,8 @@ public interface AMQPEndpointBuilder {
             super("amqp", path);
         }
         /**
-         * The kind of destination to use. The option is a java.lang.String
-         * type.
+         * The kind of destination to use. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T destinationType(String destinationType) {
             this.properties.put("destinationType", destinationType);
@@ -50,7 +50,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Name of the queue or topic to use as destination. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T destinationName(String destinationName) {
             this.properties.put("destinationName", destinationName);
@@ -61,7 +61,7 @@ public interface AMQPEndpointBuilder {
          * must be unique and can only be used by a single JMS connection
          * instance. It is typically only required for durable topic
          * subscriptions. If using Apache ActiveMQ you may prefer to use Virtual
-         * Topics instead. The option is a java.lang.String type.
+         * Topics instead. The option is a <code>java.lang.String</code> type.
          */
         public T clientId(String clientId) {
             this.properties.put("clientId", clientId);
@@ -72,7 +72,7 @@ public interface AMQPEndpointBuilder {
          * factory is not specified for either
          * setTemplateConnectionFactory(ConnectionFactory) or
          * setListenerConnectionFactory(ConnectionFactory). The option is a
-         * javax.jms.ConnectionFactory type.
+         * <code>javax.jms.ConnectionFactory</code> type.
          */
         public T connectionFactory(Object connectionFactory) {
             this.properties.put("connectionFactory", connectionFactory);
@@ -83,7 +83,7 @@ public interface AMQPEndpointBuilder {
          * factory is not specified for either
          * setTemplateConnectionFactory(ConnectionFactory) or
          * setListenerConnectionFactory(ConnectionFactory). The option will be
-         * converted to a javax.jms.ConnectionFactory type.
+         * converted to a <code>javax.jms.ConnectionFactory</code> type.
          */
         public T connectionFactory(String connectionFactory) {
             this.properties.put("connectionFactory", connectionFactory);
@@ -98,7 +98,7 @@ public interface AMQPEndpointBuilder {
          * handles the reply message. You can also use this option if you want
          * to use Camel as a proxy between different message brokers and you
          * want to route message from one system to another. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T disableReplyTo(boolean disableReplyTo) {
             this.properties.put("disableReplyTo", disableReplyTo);
@@ -113,7 +113,7 @@ public interface AMQPEndpointBuilder {
          * handles the reply message. You can also use this option if you want
          * to use Camel as a proxy between different message brokers and you
          * want to route message from one system to another. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T disableReplyTo(String disableReplyTo) {
             this.properties.put("disableReplyTo", disableReplyTo);
@@ -122,7 +122,7 @@ public interface AMQPEndpointBuilder {
         /**
          * The durable subscriber name for specifying durable topic
          * subscriptions. The clientId option must be configured as well. The
-         * option is a java.lang.String type.
+         * option is a <code>java.lang.String</code> type.
          */
         public T durableSubscriptionName(String durableSubscriptionName) {
             this.properties.put("durableSubscriptionName", durableSubscriptionName);
@@ -134,7 +134,7 @@ public interface AMQPEndpointBuilder {
          * Map, Object, Stream, Text. By default, Camel would determine which
          * JMS message type to use from the In body type. This option allows you
          * to specify it. The option is a
-         * org.apache.camel.component.jms.JmsMessageType type.
+         * <code>org.apache.camel.component.jms.JmsMessageType</code> type.
          */
         public T jmsMessageType(JmsMessageType jmsMessageType) {
             this.properties.put("jmsMessageType", jmsMessageType);
@@ -146,7 +146,7 @@ public interface AMQPEndpointBuilder {
          * Map, Object, Stream, Text. By default, Camel would determine which
          * JMS message type to use from the In body type. This option allows you
          * to specify it. The option will be converted to a
-         * org.apache.camel.component.jms.JmsMessageType type.
+         * <code>org.apache.camel.component.jms.JmsMessageType</code> type.
          */
         public T jmsMessageType(String jmsMessageType) {
             this.properties.put("jmsMessageType", jmsMessageType);
@@ -158,7 +158,7 @@ public interface AMQPEndpointBuilder {
          * connection to the JMS broker. If a connection cannot be granted then
          * Camel throws an exception on startup. This ensures that Camel is not
          * started with failed connections. The JMS producers is tested as well.
-         * The option is a boolean type.
+         * The option is a <code>boolean</code> type.
          */
         public T testConnectionOnStartup(boolean testConnectionOnStartup) {
             this.properties.put("testConnectionOnStartup", testConnectionOnStartup);
@@ -170,7 +170,7 @@ public interface AMQPEndpointBuilder {
          * connection to the JMS broker. If a connection cannot be granted then
          * Camel throws an exception on startup. This ensures that Camel is not
          * started with failed connections. The JMS producers is tested as well.
-         * The option will be converted to a boolean type.
+         * The option will be converted to a <code>boolean</code> type.
          */
         public T testConnectionOnStartup(String testConnectionOnStartup) {
             this.properties.put("testConnectionOnStartup", testConnectionOnStartup);
@@ -180,7 +180,7 @@ public interface AMQPEndpointBuilder {
          * Controls whether or not to include serialized headers. Applies only
          * when isTransferExchange() is true. This requires that the objects are
          * serializable. Camel will exclude any non-serializable objects and log
-         * it at WARN level. The option is a boolean type.
+         * it at WARN level. The option is a <code>boolean</code> type.
          */
         public T allowSerializedHeaders(boolean allowSerializedHeaders) {
             this.properties.put("allowSerializedHeaders", allowSerializedHeaders);
@@ -190,7 +190,8 @@ public interface AMQPEndpointBuilder {
          * Controls whether or not to include serialized headers. Applies only
          * when isTransferExchange() is true. This requires that the objects are
          * serializable. Camel will exclude any non-serializable objects and log
-         * it at WARN level. The option will be converted to a boolean type.
+         * it at WARN level. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T allowSerializedHeaders(String allowSerializedHeaders) {
             this.properties.put("allowSerializedHeaders", allowSerializedHeaders);
@@ -207,7 +208,7 @@ public interface AMQPEndpointBuilder {
          * if the connection could not be established, then an exception is
          * logged at WARN level, and the consumer will not be able to receive
          * messages; You can then restart the route to retry. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T asyncStartListener(boolean asyncStartListener) {
             this.properties.put("asyncStartListener", asyncStartListener);
@@ -224,7 +225,7 @@ public interface AMQPEndpointBuilder {
          * if the connection could not be established, then an exception is
          * logged at WARN level, and the consumer will not be able to receive
          * messages; You can then restart the route to retry. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T asyncStartListener(String asyncStartListener) {
             this.properties.put("asyncStartListener", asyncStartListener);
@@ -232,7 +233,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Whether to stop the JmsConsumer message listener asynchronously, when
-         * stopping a route. The option is a boolean type.
+         * stopping a route. The option is a <code>boolean</code> type.
          */
         public T asyncStopListener(boolean asyncStopListener) {
             this.properties.put("asyncStopListener", asyncStopListener);
@@ -240,7 +241,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Whether to stop the JmsConsumer message listener asynchronously, when
-         * stopping a route. The option will be converted to a boolean type.
+         * stopping a route. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T asyncStopListener(String asyncStopListener) {
             this.properties.put("asyncStopListener", asyncStopListener);
@@ -249,7 +251,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -258,7 +260,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -269,7 +271,7 @@ public interface AMQPEndpointBuilder {
          * org.springframework.jms.support.destination.DestinationResolver that
          * allows you to use your own resolver (for example, to lookup the real
          * destination in a JNDI registry). The option is a
-         * org.springframework.jms.support.destination.DestinationResolver type.
+         * <code>org.springframework.jms.support.destination.DestinationResolver</code> type.
          */
         public T destinationResolver(Object destinationResolver) {
             this.properties.put("destinationResolver", destinationResolver);
@@ -280,7 +282,7 @@ public interface AMQPEndpointBuilder {
          * org.springframework.jms.support.destination.DestinationResolver that
          * allows you to use your own resolver (for example, to lookup the real
          * destination in a JNDI registry). The option will be converted to a
-         * org.springframework.jms.support.destination.DestinationResolver type.
+         * <code>org.springframework.jms.support.destination.DestinationResolver</code> type.
          */
         public T destinationResolver(String destinationResolver) {
             this.properties.put("destinationResolver", destinationResolver);
@@ -294,7 +296,7 @@ public interface AMQPEndpointBuilder {
          * whether stack traces should be logged using errorHandlerLoggingLevel
          * and errorHandlerLogStackTrace options. This makes it much easier to
          * configure, than having to code a custom errorHandler. The option is a
-         * org.springframework.util.ErrorHandler type.
+         * <code>org.springframework.util.ErrorHandler</code> type.
          */
         public T errorHandler(Object errorHandler) {
             this.properties.put("errorHandler", errorHandler);
@@ -308,7 +310,8 @@ public interface AMQPEndpointBuilder {
          * whether stack traces should be logged using errorHandlerLoggingLevel
          * and errorHandlerLogStackTrace options. This makes it much easier to
          * configure, than having to code a custom errorHandler. The option will
-         * be converted to a org.springframework.util.ErrorHandler type.
+         * be converted to a <code>org.springframework.util.ErrorHandler</code>
+         * type.
          */
         public T errorHandler(String errorHandler) {
             this.properties.put("errorHandler", errorHandler);
@@ -317,7 +320,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies the JMS Exception Listener that is to be notified of any
          * underlying JMS exceptions. The option is a
-         * javax.jms.ExceptionListener type.
+         * <code>javax.jms.ExceptionListener</code> type.
          */
         public T exceptionListener(Object exceptionListener) {
             this.properties.put("exceptionListener", exceptionListener);
@@ -326,7 +329,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies the JMS Exception Listener that is to be notified of any
          * underlying JMS exceptions. The option will be converted to a
-         * javax.jms.ExceptionListener type.
+         * <code>javax.jms.ExceptionListener</code> type.
          */
         public T exceptionListener(String exceptionListener) {
             this.properties.put("exceptionListener", exceptionListener);
@@ -335,7 +338,7 @@ public interface AMQPEndpointBuilder {
         /**
          * To use a custom HeaderFilterStrategy to filter header to and from
          * Camel message. The option is a
-         * org.apache.camel.spi.HeaderFilterStrategy type.
+         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
          */
         public T headerFilterStrategy(HeaderFilterStrategy headerFilterStrategy) {
             this.properties.put("headerFilterStrategy", headerFilterStrategy);
@@ -344,7 +347,7 @@ public interface AMQPEndpointBuilder {
         /**
          * To use a custom HeaderFilterStrategy to filter header to and from
          * Camel message. The option will be converted to a
-         * org.apache.camel.spi.HeaderFilterStrategy type.
+         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
          */
         public T headerFilterStrategy(String headerFilterStrategy) {
             this.properties.put("headerFilterStrategy", headerFilterStrategy);
@@ -352,7 +355,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specify the limit for the number of consumers that are allowed to be
-         * idle at any given time. The option is a int type.
+         * idle at any given time. The option is a <code>int</code> type.
          */
         public T idleConsumerLimit(int idleConsumerLimit) {
             this.properties.put("idleConsumerLimit", idleConsumerLimit);
@@ -360,7 +363,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specify the limit for the number of consumers that are allowed to be
-         * idle at any given time. The option will be converted to a int type.
+         * idle at any given time. The option will be converted to a
+         * <code>int</code> type.
          */
         public T idleConsumerLimit(String idleConsumerLimit) {
             this.properties.put("idleConsumerLimit", idleConsumerLimit);
@@ -372,7 +376,7 @@ public interface AMQPEndpointBuilder {
          * the task will shut down and leave receiving to other executing tasks
          * (in the case of dynamic scheduling; see the maxConcurrentConsumers
          * setting). There is additional doc available from Spring. The option
-         * is a int type.
+         * is a <code>int</code> type.
          */
         public T idleTaskExecutionLimit(int idleTaskExecutionLimit) {
             this.properties.put("idleTaskExecutionLimit", idleTaskExecutionLimit);
@@ -384,7 +388,7 @@ public interface AMQPEndpointBuilder {
          * the task will shut down and leave receiving to other executing tasks
          * (in the case of dynamic scheduling; see the maxConcurrentConsumers
          * setting). There is additional doc available from Spring. The option
-         * will be converted to a int type.
+         * will be converted to a <code>int</code> type.
          */
         public T idleTaskExecutionLimit(String idleTaskExecutionLimit) {
             this.properties.put("idleTaskExecutionLimit", idleTaskExecutionLimit);
@@ -395,7 +399,7 @@ public interface AMQPEndpointBuilder {
          * Camel Message. Setting this to true will include properties such as
          * JMSXAppID, and JMSXUserID etc. Note: If you are using a custom
          * headerFilterStrategy then this option does not apply. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T includeAllJMSXProperties(boolean includeAllJMSXProperties) {
             this.properties.put("includeAllJMSXProperties", includeAllJMSXProperties);
@@ -406,7 +410,7 @@ public interface AMQPEndpointBuilder {
          * Camel Message. Setting this to true will include properties such as
          * JMSXAppID, and JMSXUserID etc. Note: If you are using a custom
          * headerFilterStrategy then this option does not apply. The option will
-         * be converted to a boolean type.
+         * be converted to a <code>boolean</code> type.
          */
         public T includeAllJMSXProperties(String includeAllJMSXProperties) {
             this.properties.put("includeAllJMSXProperties", includeAllJMSXProperties);
@@ -421,7 +425,9 @@ public interface AMQPEndpointBuilder {
          * brokers which do not care whether JMS header keys contain illegal
          * characters. You can provide your own implementation of the
          * org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it
-         * using the # notation. The option is a java.lang.String type.
+         * using the # notation. The option is a
+         * <code>org.apache.camel.component.jms.JmsKeyFormatStrategy</code>
+         * type.
          */
         public T jmsKeyFormatStrategy(Object jmsKeyFormatStrategy) {
             this.properties.put("jmsKeyFormatStrategy", jmsKeyFormatStrategy);
@@ -437,7 +443,8 @@ public interface AMQPEndpointBuilder {
          * characters. You can provide your own implementation of the
          * org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it
          * using the # notation. The option will be converted to a
-         * java.lang.String type.
+         * <code>org.apache.camel.component.jms.JmsKeyFormatStrategy</code>
+         * type.
          */
         public T jmsKeyFormatStrategy(String jmsKeyFormatStrategy) {
             this.properties.put("jmsKeyFormatStrategy", jmsKeyFormatStrategy);
@@ -446,7 +453,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies whether Camel should auto map the received JMS message to a
          * suited payload type, such as javax.jms.TextMessage to a String etc.
-         * The option is a boolean type.
+         * The option is a <code>boolean</code> type.
          */
         public T mapJmsMessage(boolean mapJmsMessage) {
             this.properties.put("mapJmsMessage", mapJmsMessage);
@@ -455,7 +462,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies whether Camel should auto map the received JMS message to a
          * suited payload type, such as javax.jms.TextMessage to a String etc.
-         * The option will be converted to a boolean type.
+         * The option will be converted to a <code>boolean</code> type.
          */
         public T mapJmsMessage(String mapJmsMessage) {
             this.properties.put("mapJmsMessage", mapJmsMessage);
@@ -465,7 +472,8 @@ public interface AMQPEndpointBuilder {
          * The number of messages per task. -1 is unlimited. If you use a range
          * for concurrent consumers (eg min max), then this option can be used
          * to set a value to eg 100 to control how fast the consumers will
-         * shrink when less work is required. The option is a int type.
+         * shrink when less work is required. The option is a <code>int</code>
+         * type.
          */
         public T maxMessagesPerTask(int maxMessagesPerTask) {
             this.properties.put("maxMessagesPerTask", maxMessagesPerTask);
@@ -476,7 +484,7 @@ public interface AMQPEndpointBuilder {
          * for concurrent consumers (eg min max), then this option can be used
          * to set a value to eg 100 to control how fast the consumers will
          * shrink when less work is required. The option will be converted to a
-         * int type.
+         * <code>int</code> type.
          */
         public T maxMessagesPerTask(String maxMessagesPerTask) {
             this.properties.put("maxMessagesPerTask", maxMessagesPerTask);
@@ -486,7 +494,7 @@ public interface AMQPEndpointBuilder {
          * To use a custom Spring
          * org.springframework.jms.support.converter.MessageConverter so you can
          * be in control how to map to/from a javax.jms.Message. The option is a
-         * org.springframework.jms.support.converter.MessageConverter type.
+         * <code>org.springframework.jms.support.converter.MessageConverter</code> type.
          */
         public T messageConverter(Object messageConverter) {
             this.properties.put("messageConverter", messageConverter);
@@ -497,7 +505,7 @@ public interface AMQPEndpointBuilder {
          * org.springframework.jms.support.converter.MessageConverter so you can
          * be in control how to map to/from a javax.jms.Message. The option will
          * be converted to a
-         * org.springframework.jms.support.converter.MessageConverter type.
+         * <code>org.springframework.jms.support.converter.MessageConverter</code> type.
          */
         public T messageConverter(String messageConverter) {
             this.properties.put("messageConverter", messageConverter);
@@ -507,7 +515,8 @@ public interface AMQPEndpointBuilder {
          * To use the given MessageCreatedStrategy which are invoked when Camel
          * creates new instances of javax.jms.Message objects when Camel is
          * sending a JMS message. The option is a
-         * org.apache.camel.component.jms.MessageCreatedStrategy type.
+         * <code>org.apache.camel.component.jms.MessageCreatedStrategy</code>
+         * type.
          */
         public T messageCreatedStrategy(Object messageCreatedStrategy) {
             this.properties.put("messageCreatedStrategy", messageCreatedStrategy);
@@ -517,7 +526,8 @@ public interface AMQPEndpointBuilder {
          * To use the given MessageCreatedStrategy which are invoked when Camel
          * creates new instances of javax.jms.Message objects when Camel is
          * sending a JMS message. The option will be converted to a
-         * org.apache.camel.component.jms.MessageCreatedStrategy type.
+         * <code>org.apache.camel.component.jms.MessageCreatedStrategy</code>
+         * type.
          */
         public T messageCreatedStrategy(String messageCreatedStrategy) {
             this.properties.put("messageCreatedStrategy", messageCreatedStrategy);
@@ -528,7 +538,7 @@ public interface AMQPEndpointBuilder {
          * just an hint to the JMS Broker. If the JMS provider accepts this
          * hint, these messages must have the message ID set to null; if the
          * provider ignores the hint, the message ID must be set to its normal
-         * unique value. The option is a boolean type.
+         * unique value. The option is a <code>boolean</code> type.
          */
         public T messageIdEnabled(boolean messageIdEnabled) {
             this.properties.put("messageIdEnabled", messageIdEnabled);
@@ -539,7 +549,8 @@ public interface AMQPEndpointBuilder {
          * just an hint to the JMS Broker. If the JMS provider accepts this
          * hint, these messages must have the message ID set to null; if the
          * provider ignores the hint, the message ID must be set to its normal
-         * unique value. The option will be converted to a boolean type.
+         * unique value. The option will be converted to a <code>boolean</code>
+         * type.
          */
         public T messageIdEnabled(String messageIdEnabled) {
             this.properties.put("messageIdEnabled", messageIdEnabled);
@@ -551,7 +562,7 @@ public interface AMQPEndpointBuilder {
          * org.springframework.jms.listener.AbstractMessageListenerContainer to
          * use to consume messages. Setting this will automatically set
          * consumerType to Custom. The option is a
-         * org.apache.camel.component.jms.MessageListenerContainerFactory type.
+         * <code>org.apache.camel.component.jms.MessageListenerContainerFactory</code> type.
          */
         public T messageListenerContainerFactory(
                 Object messageListenerContainerFactory) {
@@ -564,7 +575,7 @@ public interface AMQPEndpointBuilder {
          * org.springframework.jms.listener.AbstractMessageListenerContainer to
          * use to consume messages. Setting this will automatically set
          * consumerType to Custom. The option will be converted to a
-         * org.apache.camel.component.jms.MessageListenerContainerFactory type.
+         * <code>org.apache.camel.component.jms.MessageListenerContainerFactory</code> type.
          */
         public T messageListenerContainerFactory(
                 String messageListenerContainerFactory) {
@@ -576,7 +587,7 @@ public interface AMQPEndpointBuilder {
          * messages. This is just an hint to the JMS Broker. If the JMS provider
          * accepts this hint, these messages must have the timestamp set to
          * zero; if the provider ignores the hint, the timestamp must be set to
-         * its normal value. The option is a boolean type.
+         * its normal value. The option is a <code>boolean</code> type.
          */
         public T messageTimestampEnabled(boolean messageTimestampEnabled) {
             this.properties.put("messageTimestampEnabled", messageTimestampEnabled);
@@ -587,7 +598,8 @@ public interface AMQPEndpointBuilder {
          * messages. This is just an hint to the JMS Broker. If the JMS provider
          * accepts this hint, these messages must have the timestamp set to
          * zero; if the provider ignores the hint, the timestamp must be set to
-         * its normal value. The option will be converted to a boolean type.
+         * its normal value. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T messageTimestampEnabled(String messageTimestampEnabled) {
             this.properties.put("messageTimestampEnabled", messageTimestampEnabled);
@@ -595,7 +607,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether to inhibit the delivery of messages published by
-         * its own connection. The option is a boolean type.
+         * its own connection. The option is a <code>boolean</code> type.
          */
         public T pubSubNoLocal(boolean pubSubNoLocal) {
             this.properties.put("pubSubNoLocal", pubSubNoLocal);
@@ -603,7 +615,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether to inhibit the delivery of messages published by
-         * its own connection. The option will be converted to a boolean type.
+         * its own connection. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T pubSubNoLocal(String pubSubNoLocal) {
             this.properties.put("pubSubNoLocal", pubSubNoLocal);
@@ -611,7 +624,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * The timeout for receiving messages (in milliseconds). The option is a
-         * long type.
+         * <code>long</code> type.
          */
         public T receiveTimeout(long receiveTimeout) {
             this.properties.put("receiveTimeout", receiveTimeout);
@@ -619,7 +632,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * The timeout for receiving messages (in milliseconds). The option will
-         * be converted to a long type.
+         * be converted to a <code>long</code> type.
          */
         public T receiveTimeout(String receiveTimeout) {
             this.properties.put("receiveTimeout", receiveTimeout);
@@ -628,7 +641,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies the interval between recovery attempts, i.e. when a
          * connection is being refreshed, in milliseconds. The default is 5000
-         * ms, that is, 5 seconds. The option is a long type.
+         * ms, that is, 5 seconds. The option is a <code>long</code> type.
          */
         public T recoveryInterval(long recoveryInterval) {
             this.properties.put("recoveryInterval", recoveryInterval);
@@ -637,7 +650,8 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies the interval between recovery attempts, i.e. when a
          * connection is being refreshed, in milliseconds. The default is 5000
-         * ms, that is, 5 seconds. The option will be converted to a long type.
+         * ms, that is, 5 seconds. The option will be converted to a
+         * <code>long</code> type.
          */
         public T recoveryInterval(String recoveryInterval) {
             this.properties.put("recoveryInterval", recoveryInterval);
@@ -648,7 +662,8 @@ public interface AMQPEndpointBuilder {
          * doing request/reply over JMS. By default Camel checks once per
          * second. But if you must react faster when a timeout occurs, then you
          * can lower this interval, to check more frequently. The timeout is
-         * determined by the option requestTimeout. The option is a long type.
+         * determined by the option requestTimeout. The option is a
+         * <code>long</code> type.
          */
         public T requestTimeoutCheckerInterval(
                 long requestTimeoutCheckerInterval) {
@@ -661,7 +676,7 @@ public interface AMQPEndpointBuilder {
          * second. But if you must react faster when a timeout occurs, then you
          * can lower this interval, to check more frequently. The timeout is
          * determined by the option requestTimeout. The option will be converted
-         * to a long type.
+         * to a <code>long</code> type.
          */
         public T requestTimeoutCheckerInterval(
                 String requestTimeoutCheckerInterval) {
@@ -671,7 +686,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -680,7 +695,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -697,7 +712,7 @@ public interface AMQPEndpointBuilder {
          * exception is required to be serializable. The original Exception on
          * the consumer side can be wrapped in an outer exception such as
          * org.apache.camel.RuntimeCamelException when returned to the producer.
-         * The option is a boolean type.
+         * The option is a <code>boolean</code> type.
          */
         public T transferException(boolean transferException) {
             this.properties.put("transferException", transferException);
@@ -714,7 +729,7 @@ public interface AMQPEndpointBuilder {
          * exception is required to be serializable. The original Exception on
          * the consumer side can be wrapped in an outer exception such as
          * org.apache.camel.RuntimeCamelException when returned to the producer.
-         * The option will be converted to a boolean type.
+         * The option will be converted to a <code>boolean</code> type.
          */
         public T transferException(String transferException) {
             this.properties.put("transferException", transferException);
@@ -728,7 +743,7 @@ public interface AMQPEndpointBuilder {
          * serializable. Camel will exclude any non-serializable objects and log
          * it at WARN level. You must enable this option on both the producer
          * and consumer side, so Camel knows the payloads is an Exchange and not
-         * a regular payload. The option is a boolean type.
+         * a regular payload. The option is a <code>boolean</code> type.
          */
         public T transferExchange(boolean transferExchange) {
             this.properties.put("transferExchange", transferExchange);
@@ -742,7 +757,8 @@ public interface AMQPEndpointBuilder {
          * serializable. Camel will exclude any non-serializable objects and log
          * it at WARN level. You must enable this option on both the producer
          * and consumer side, so Camel knows the payloads is an Exchange and not
-         * a regular payload. The option will be converted to a boolean type.
+         * a regular payload. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T transferExchange(String transferExchange) {
             this.properties.put("transferExchange", transferExchange);
@@ -757,7 +773,8 @@ public interface AMQPEndpointBuilder {
          * fault flag will be set on the
          * org.apache.camel.Message#setFault(boolean). You may want to enable
          * this when using Camel components that support faults such as SOAP
-         * based such as cxf or spring-ws. The option is a boolean type.
+         * based such as cxf or spring-ws. The option is a <code>boolean</code>
+         * type.
          */
         public T transferFault(boolean transferFault) {
             this.properties.put("transferFault", transferFault);
@@ -773,7 +790,7 @@ public interface AMQPEndpointBuilder {
          * org.apache.camel.Message#setFault(boolean). You may want to enable
          * this when using Camel components that support faults such as SOAP
          * based such as cxf or spring-ws. The option will be converted to a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T transferFault(String transferFault) {
             this.properties.put("transferFault", transferFault);
@@ -781,7 +798,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether JMSMessageID should always be used as
-         * JMSCorrelationID for InOut messages. The option is a boolean type.
+         * JMSCorrelationID for InOut messages. The option is a
+         * <code>boolean</code> type.
          */
         public T useMessageIDAsCorrelationID(boolean useMessageIDAsCorrelationID) {
             this.properties.put("useMessageIDAsCorrelationID", useMessageIDAsCorrelationID);
@@ -790,7 +808,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies whether JMSMessageID should always be used as
          * JMSCorrelationID for InOut messages. The option will be converted to
-         * a boolean type.
+         * a <code>boolean</code> type.
          */
         public T useMessageIDAsCorrelationID(String useMessageIDAsCorrelationID) {
             this.properties.put("useMessageIDAsCorrelationID", useMessageIDAsCorrelationID);
@@ -800,7 +818,7 @@ public interface AMQPEndpointBuilder {
          * Number of times to wait for provisional correlation id to be updated
          * to the actual correlation id when doing request/reply over JMS and
          * when the option useMessageIDAsCorrelationID is enabled. The option is
-         * a int type.
+         * a <code>int</code> type.
          */
         public T waitForProvisionCorrelationToBeUpdatedCounter(
                 int waitForProvisionCorrelationToBeUpdatedCounter) {
@@ -811,7 +829,7 @@ public interface AMQPEndpointBuilder {
          * Number of times to wait for provisional correlation id to be updated
          * to the actual correlation id when doing request/reply over JMS and
          * when the option useMessageIDAsCorrelationID is enabled. The option
-         * will be converted to a int type.
+         * will be converted to a <code>int</code> type.
          */
         public T waitForProvisionCorrelationToBeUpdatedCounter(
                 String waitForProvisionCorrelationToBeUpdatedCounter) {
@@ -820,7 +838,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Interval in millis to sleep each time while waiting for provisional
-         * correlation id to be updated. The option is a long type.
+         * correlation id to be updated. The option is a <code>long</code> type.
          */
         public T waitForProvisionCorrelationToBeUpdatedThreadSleepingTime(
                 long waitForProvisionCorrelationToBeUpdatedThreadSleepingTime) {
@@ -829,8 +847,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Interval in millis to sleep each time while waiting for provisional
-         * correlation id to be updated. The option will be converted to a long
-         * type.
+         * correlation id to be updated. The option will be converted to a
+         * <code>long</code> type.
          */
         public T waitForProvisionCorrelationToBeUpdatedThreadSleepingTime(
                 String waitForProvisionCorrelationToBeUpdatedThreadSleepingTime) {
@@ -840,7 +858,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Password to use with the ConnectionFactory. You can also configure
          * username/password directly on the ConnectionFactory. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T password(String password) {
             this.properties.put("password", password);
@@ -849,15 +867,15 @@ public interface AMQPEndpointBuilder {
         /**
          * Username to use with the ConnectionFactory. You can also configure
          * username/password directly on the ConnectionFactory. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T username(String username) {
             this.properties.put("username", username);
             return (T) this;
         }
         /**
-         * Specifies whether to use transacted mode. The option is a boolean
-         * type.
+         * Specifies whether to use transacted mode. The option is a
+         * <code>boolean</code> type.
          */
         public T transacted(boolean transacted) {
             this.properties.put("transacted", transacted);
@@ -865,7 +883,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether to use transacted mode. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T transacted(String transacted) {
             this.properties.put("transacted", transacted);
@@ -874,7 +892,7 @@ public interface AMQPEndpointBuilder {
         /**
          * If true, Camel will create a JmsTransactionManager, if there is no
          * transactionManager injected when option transacted=true. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T lazyCreateTransactionManager(
                 boolean lazyCreateTransactionManager) {
@@ -884,7 +902,7 @@ public interface AMQPEndpointBuilder {
         /**
          * If true, Camel will create a JmsTransactionManager, if there is no
          * transactionManager injected when option transacted=true. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T lazyCreateTransactionManager(
                 String lazyCreateTransactionManager) {
@@ -893,7 +911,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * The Spring transaction manager to use. The option is a
-         * org.springframework.transaction.PlatformTransactionManager type.
+         * <code>org.springframework.transaction.PlatformTransactionManager</code> type.
          */
         public T transactionManager(Object transactionManager) {
             this.properties.put("transactionManager", transactionManager);
@@ -901,15 +919,16 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * The Spring transaction manager to use. The option will be converted
-         * to a org.springframework.transaction.PlatformTransactionManager type.
+         * to a
+         * <code>org.springframework.transaction.PlatformTransactionManager</code> type.
          */
         public T transactionManager(String transactionManager) {
             this.properties.put("transactionManager", transactionManager);
             return (T) this;
         }
         /**
-         * The name of the transaction to use. The option is a java.lang.String
-         * type.
+         * The name of the transaction to use. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T transactionName(String transactionName) {
             this.properties.put("transactionName", transactionName);
@@ -917,7 +936,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * The timeout value of the transaction (in seconds), if using
-         * transacted mode. The option is a int type.
+         * transacted mode. The option is a <code>int</code> type.
          */
         public T transactionTimeout(int transactionTimeout) {
             this.properties.put("transactionTimeout", transactionTimeout);
@@ -925,7 +944,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * The timeout value of the transaction (in seconds), if using
-         * transacted mode. The option will be converted to a int type.
+         * transacted mode. The option will be converted to a <code>int</code>
+         * type.
          */
         public T transactionTimeout(String transactionTimeout) {
             this.properties.put("transactionTimeout", transactionTimeout);
@@ -944,7 +964,7 @@ public interface AMQPEndpointBuilder {
         /**
          * The JMS acknowledgement name, which is one of: SESSION_TRANSACTED,
          * CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. The option
-         * is a java.lang.String type.
+         * is a <code>java.lang.String</code> type.
          */
         public AMQPConsumerBuilder acknowledgementModeName(
                 String acknowledgementModeName) {
@@ -961,7 +981,7 @@ public interface AMQPEndpointBuilder {
          * the next message from the JMS queue. Note if transacted has been
          * enabled, then asyncConsumer=true does not run asynchronously, as
          * transaction must be executed synchronously (Camel 3.0 may support
-         * async transactions). The option is a boolean type.
+         * async transactions). The option is a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder asyncConsumer(boolean asyncConsumer) {
             this.properties.put("asyncConsumer", asyncConsumer);
@@ -977,7 +997,8 @@ public interface AMQPEndpointBuilder {
          * the next message from the JMS queue. Note if transacted has been
          * enabled, then asyncConsumer=true does not run asynchronously, as
          * transaction must be executed synchronously (Camel 3.0 may support
-         * async transactions). The option will be converted to a boolean type.
+         * async transactions). The option will be converted to a
+         * <code>boolean</code> type.
          */
         public AMQPConsumerBuilder asyncConsumer(String asyncConsumer) {
             this.properties.put("asyncConsumer", asyncConsumer);
@@ -985,7 +1006,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether the consumer container should auto-startup. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder autoStartup(boolean autoStartup) {
             this.properties.put("autoStartup", autoStartup);
@@ -993,7 +1014,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether the consumer container should auto-startup. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder autoStartup(String autoStartup) {
             this.properties.put("autoStartup", autoStartup);
@@ -1006,7 +1027,7 @@ public interface AMQPEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder bridgeErrorHandler(boolean bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -1019,7 +1040,7 @@ public interface AMQPEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder bridgeErrorHandler(String bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -1027,7 +1048,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Sets the cache level by ID for the underlying JMS resources. See
-         * cacheLevelName option for more details. The option is a int type.
+         * cacheLevelName option for more details. The option is a
+         * <code>int</code> type.
          */
         public AMQPConsumerBuilder cacheLevel(int cacheLevel) {
             this.properties.put("cacheLevel", cacheLevel);
@@ -1036,7 +1058,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Sets the cache level by ID for the underlying JMS resources. See
          * cacheLevelName option for more details. The option will be converted
-         * to a int type.
+         * to a <code>int</code> type.
          */
         public AMQPConsumerBuilder cacheLevel(String cacheLevel) {
             this.properties.put("cacheLevel", cacheLevel);
@@ -1047,7 +1069,7 @@ public interface AMQPEndpointBuilder {
          * Possible values are: CACHE_AUTO, CACHE_CONNECTION, CACHE_CONSUMER,
          * CACHE_NONE, and CACHE_SESSION. The default setting is CACHE_AUTO. See
          * the Spring documentation and Transactions Cache Levels for more
-         * information. The option is a java.lang.String type.
+         * information. The option is a <code>java.lang.String</code> type.
          */
         public AMQPConsumerBuilder cacheLevelName(String cacheLevelName) {
             this.properties.put("cacheLevelName", cacheLevelName);
@@ -1059,7 +1081,8 @@ public interface AMQPEndpointBuilder {
          * maxMessagesPerTask option to control dynamic scaling up/down of
          * threads. When doing request/reply over JMS then the option
          * replyToConcurrentConsumers is used to control number of concurrent
-         * consumers on the reply message listener. The option is a int type.
+         * consumers on the reply message listener. The option is a
+         * <code>int</code> type.
          */
         public AMQPConsumerBuilder concurrentConsumers(int concurrentConsumers) {
             this.properties.put("concurrentConsumers", concurrentConsumers);
@@ -1072,7 +1095,7 @@ public interface AMQPEndpointBuilder {
          * threads. When doing request/reply over JMS then the option
          * replyToConcurrentConsumers is used to control number of concurrent
          * consumers on the reply message listener. The option will be converted
-         * to a int type.
+         * to a <code>int</code> type.
          */
         public AMQPConsumerBuilder concurrentConsumers(
                 String concurrentConsumers) {
@@ -1085,7 +1108,8 @@ public interface AMQPEndpointBuilder {
          * maxMessagesPerTask option to control dynamic scaling up/down of
          * threads. When doing request/reply over JMS then the option
          * replyToMaxConcurrentConsumers is used to control number of concurrent
-         * consumers on the reply message listener. The option is a int type.
+         * consumers on the reply message listener. The option is a
+         * <code>int</code> type.
          */
         public AMQPConsumerBuilder maxConcurrentConsumers(
                 int maxConcurrentConsumers) {
@@ -1099,7 +1123,7 @@ public interface AMQPEndpointBuilder {
          * threads. When doing request/reply over JMS then the option
          * replyToMaxConcurrentConsumers is used to control number of concurrent
          * consumers on the reply message listener. The option will be converted
-         * to a int type.
+         * to a <code>int</code> type.
          */
         public AMQPConsumerBuilder maxConcurrentConsumers(
                 String maxConcurrentConsumers) {
@@ -1109,7 +1133,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Provides an explicit ReplyTo destination, which overrides any
          * incoming value of Message.getJMSReplyTo(). The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public AMQPConsumerBuilder replyTo(String replyTo) {
             this.properties.put("replyTo", replyTo);
@@ -1117,7 +1141,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether to use persistent delivery by default for replies.
-         * The option is a boolean type.
+         * The option is a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder replyToDeliveryPersistent(
                 boolean replyToDeliveryPersistent) {
@@ -1126,7 +1150,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether to use persistent delivery by default for replies.
-         * The option will be converted to a boolean type.
+         * The option will be converted to a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder replyToDeliveryPersistent(
                 String replyToDeliveryPersistent) {
@@ -1134,7 +1158,8 @@ public interface AMQPEndpointBuilder {
             return (AMQPConsumerBuilder) this;
         }
         /**
-         * Sets the JMS selector to use. The option is a java.lang.String type.
+         * Sets the JMS selector to use. The option is a
+         * <code>java.lang.String</code> type.
          */
         public AMQPConsumerBuilder selector(String selector) {
             this.properties.put("selector", selector);
@@ -1148,7 +1173,7 @@ public interface AMQPEndpointBuilder {
          * subscriptionName value (unless your message listener class name is
          * good enough as subscription name). Only makes sense when listening to
          * a topic (pub-sub domain), therefore this method switches the
-         * pubSubDomain flag as well. The option is a boolean type.
+         * pubSubDomain flag as well. The option is a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder subscriptionDurable(
                 boolean subscriptionDurable) {
@@ -1163,8 +1188,8 @@ public interface AMQPEndpointBuilder {
          * subscriptionName value (unless your message listener class name is
          * good enough as subscription name). Only makes sense when listening to
          * a topic (pub-sub domain), therefore this method switches the
-         * pubSubDomain flag as well. The option will be converted to a boolean
-         * type.
+         * pubSubDomain flag as well. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public AMQPConsumerBuilder subscriptionDurable(
                 String subscriptionDurable) {
@@ -1179,7 +1204,7 @@ public interface AMQPEndpointBuilder {
          * Note: Only 1 concurrent consumer (which is the default of this
          * message listener container) is allowed for each subscription, except
          * for a shared subscription (which requires JMS 2.0). The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public AMQPConsumerBuilder subscriptionName(String subscriptionName) {
             this.properties.put("subscriptionName", subscriptionName);
@@ -1196,7 +1221,7 @@ public interface AMQPEndpointBuilder {
          * subscriptionDurable as well. Only makes sense when listening to a
          * topic (pub-sub domain), therefore this method switches the
          * pubSubDomain flag as well. Requires a JMS 2.0 compatible message
-         * broker. The option is a boolean type.
+         * broker. The option is a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder subscriptionShared(boolean subscriptionShared) {
             this.properties.put("subscriptionShared", subscriptionShared);
@@ -1213,7 +1238,7 @@ public interface AMQPEndpointBuilder {
          * subscriptionDurable as well. Only makes sense when listening to a
          * topic (pub-sub domain), therefore this method switches the
          * pubSubDomain flag as well. Requires a JMS 2.0 compatible message
-         * broker. The option will be converted to a boolean type.
+         * broker. The option will be converted to a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder subscriptionShared(String subscriptionShared) {
             this.properties.put("subscriptionShared", subscriptionShared);
@@ -1228,7 +1253,7 @@ public interface AMQPEndpointBuilder {
          * redeliveries, which yet again may be rejected, and eventually the
          * message may be moved at a dead letter queue on the JMS broker. To
          * avoid this its recommended to enable this option. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public AMQPConsumerBuilder acceptMessagesWhileStopping(
                 boolean acceptMessagesWhileStopping) {
@@ -1244,7 +1269,7 @@ public interface AMQPEndpointBuilder {
          * redeliveries, which yet again may be rejected, and eventually the
          * message may be moved at a dead letter queue on the JMS broker. To
          * avoid this its recommended to enable this option. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder acceptMessagesWhileStopping(
                 String acceptMessagesWhileStopping) {
@@ -1259,7 +1284,7 @@ public interface AMQPEndpointBuilder {
          * and org.apache.camel.CamelContext is currently being stopped. This
          * quick stop ability is enabled by default in the regular JMS consumers
          * but to enable for reply managers you must enable this flag. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder allowReplyManagerQuickStop(
                 boolean allowReplyManagerQuickStop) {
@@ -1274,7 +1299,7 @@ public interface AMQPEndpointBuilder {
          * and org.apache.camel.CamelContext is currently being stopped. This
          * quick stop ability is enabled by default in the regular JMS consumers
          * but to enable for reply managers you must enable this flag. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder allowReplyManagerQuickStop(
                 String allowReplyManagerQuickStop) {
@@ -1291,8 +1316,8 @@ public interface AMQPEndpointBuilder {
          * Custom is specified, the MessageListenerContainerFactory defined by
          * the messageListenerContainerFactory option will determine what
          * org.springframework.jms.listener.AbstractMessageListenerContainer to
-         * use. The option is a org.apache.camel.component.jms.ConsumerType
-         * type.
+         * use. The option is a
+         * <code>org.apache.camel.component.jms.ConsumerType</code> type.
          */
         public AMQPConsumerBuilder consumerType(ConsumerType consumerType) {
             this.properties.put("consumerType", consumerType);
@@ -1309,7 +1334,7 @@ public interface AMQPEndpointBuilder {
          * the messageListenerContainerFactory option will determine what
          * org.springframework.jms.listener.AbstractMessageListenerContainer to
          * use. The option will be converted to a
-         * org.apache.camel.component.jms.ConsumerType type.
+         * <code>org.apache.camel.component.jms.ConsumerType</code> type.
          */
         public AMQPConsumerBuilder consumerType(String consumerType) {
             this.properties.put("consumerType", consumerType);
@@ -1326,7 +1351,8 @@ public interface AMQPEndpointBuilder {
          * consumers. The use of ThreadPool is recommended to reduce thread
          * trash in elastic configurations with dynamically increasing and
          * decreasing concurrent consumers. The option is a
-         * org.apache.camel.component.jms.DefaultTaskExecutorType type.
+         * <code>org.apache.camel.component.jms.DefaultTaskExecutorType</code>
+         * type.
          */
         public AMQPConsumerBuilder defaultTaskExecutorType(
                 DefaultTaskExecutorType defaultTaskExecutorType) {
@@ -1344,7 +1370,8 @@ public interface AMQPEndpointBuilder {
          * consumers. The use of ThreadPool is recommended to reduce thread
          * trash in elastic configurations with dynamically increasing and
          * decreasing concurrent consumers. The option will be converted to a
-         * org.apache.camel.component.jms.DefaultTaskExecutorType type.
+         * <code>org.apache.camel.component.jms.DefaultTaskExecutorType</code>
+         * type.
          */
         public AMQPConsumerBuilder defaultTaskExecutorType(
                 String defaultTaskExecutorType) {
@@ -1356,7 +1383,7 @@ public interface AMQPEndpointBuilder {
          * message is loaded which generally is inefficient as the JMS
          * properties may not be required but sometimes can catch early any
          * issues with the underlying JMS provider and the use of JMS
-         * properties. The option is a boolean type.
+         * properties. The option is a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder eagerLoadingOfProperties(
                 boolean eagerLoadingOfProperties) {
@@ -1368,7 +1395,8 @@ public interface AMQPEndpointBuilder {
          * message is loaded which generally is inefficient as the JMS
          * properties may not be required but sometimes can catch early any
          * issues with the underlying JMS provider and the use of JMS
-         * properties. The option will be converted to a boolean type.
+         * properties. The option will be converted to a <code>boolean</code>
+         * type.
          */
         public AMQPConsumerBuilder eagerLoadingOfProperties(
                 String eagerLoadingOfProperties) {
@@ -1380,7 +1408,7 @@ public interface AMQPEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AMQPConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -1392,7 +1420,8 @@ public interface AMQPEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AMQPConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -1400,7 +1429,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AMQPConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -1409,7 +1438,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AMQPConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
@@ -1417,7 +1447,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether the listener session should be exposed when
-         * consuming messages. The option is a boolean type.
+         * consuming messages. The option is a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder exposeListenerSession(
                 boolean exposeListenerSession) {
@@ -1426,7 +1456,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether the listener session should be exposed when
-         * consuming messages. The option will be converted to a boolean type.
+         * consuming messages. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public AMQPConsumerBuilder exposeListenerSession(
                 String exposeListenerSession) {
@@ -1437,7 +1468,7 @@ public interface AMQPEndpointBuilder {
          * Whether a JMS consumer is allowed to send a reply message to the same
          * destination that the consumer is using to consume from. This prevents
          * an endless loop by consuming and sending back the same message to
-         * itself. The option is a boolean type.
+         * itself. The option is a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder replyToSameDestinationAllowed(
                 boolean replyToSameDestinationAllowed) {
@@ -1448,7 +1479,7 @@ public interface AMQPEndpointBuilder {
          * Whether a JMS consumer is allowed to send a reply message to the same
          * destination that the consumer is using to consume from. This prevents
          * an endless loop by consuming and sending back the same message to
-         * itself. The option will be converted to a boolean type.
+         * itself. The option will be converted to a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder replyToSameDestinationAllowed(
                 String replyToSameDestinationAllowed) {
@@ -1457,7 +1488,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Allows you to specify a custom task executor for consuming messages.
-         * The option is a org.springframework.core.task.TaskExecutor type.
+         * The option is a
+         * <code>org.springframework.core.task.TaskExecutor</code> type.
          */
         public AMQPConsumerBuilder taskExecutor(Object taskExecutor) {
             this.properties.put("taskExecutor", taskExecutor);
@@ -1466,7 +1498,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Allows you to specify a custom task executor for consuming messages.
          * The option will be converted to a
-         * org.springframework.core.task.TaskExecutor type.
+         * <code>org.springframework.core.task.TaskExecutor</code> type.
          */
         public AMQPConsumerBuilder taskExecutor(String taskExecutor) {
             this.properties.put("taskExecutor", taskExecutor);
@@ -1475,7 +1507,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Allows to configure the default errorHandler logging level for
          * logging uncaught exceptions. The option is a
-         * org.apache.camel.LoggingLevel type.
+         * <code>org.apache.camel.LoggingLevel</code> type.
          */
         public AMQPConsumerBuilder errorHandlerLoggingLevel(
                 LoggingLevel errorHandlerLoggingLevel) {
@@ -1485,7 +1517,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Allows to configure the default errorHandler logging level for
          * logging uncaught exceptions. The option will be converted to a
-         * org.apache.camel.LoggingLevel type.
+         * <code>org.apache.camel.LoggingLevel</code> type.
          */
         public AMQPConsumerBuilder errorHandlerLoggingLevel(
                 String errorHandlerLoggingLevel) {
@@ -1494,7 +1526,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Allows to control whether stacktraces should be logged or not, by the
-         * default errorHandler. The option is a boolean type.
+         * default errorHandler. The option is a <code>boolean</code> type.
          */
         public AMQPConsumerBuilder errorHandlerLogStackTrace(
                 boolean errorHandlerLogStackTrace) {
@@ -1503,7 +1535,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Allows to control whether stacktraces should be logged or not, by the
-         * default errorHandler. The option will be converted to a boolean type.
+         * default errorHandler. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public AMQPConsumerBuilder errorHandlerLogStackTrace(
                 String errorHandlerLogStackTrace) {
@@ -1523,7 +1556,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies the delivery mode to be used. Possibles values are those
          * defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT
-         * = 2. The option is a java.lang.Integer type.
+         * = 2. The option is a <code>java.lang.Integer</code> type.
          */
         public AMQPProducerBuilder deliveryMode(Integer deliveryMode) {
             this.properties.put("deliveryMode", deliveryMode);
@@ -1532,7 +1565,8 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies the delivery mode to be used. Possibles values are those
          * defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT
-         * = 2. The option will be converted to a java.lang.Integer type.
+         * = 2. The option will be converted to a <code>java.lang.Integer</code>
+         * type.
          */
         public AMQPProducerBuilder deliveryMode(String deliveryMode) {
             this.properties.put("deliveryMode", deliveryMode);
@@ -1540,7 +1574,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether persistent delivery is used by default. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public AMQPProducerBuilder deliveryPersistent(boolean deliveryPersistent) {
             this.properties.put("deliveryPersistent", deliveryPersistent);
@@ -1548,7 +1582,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Specifies whether persistent delivery is used by default. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public AMQPProducerBuilder deliveryPersistent(String deliveryPersistent) {
             this.properties.put("deliveryPersistent", deliveryPersistent);
@@ -1561,7 +1595,7 @@ public interface AMQPEndpointBuilder {
          * options are applied to the current endpoint. This contrasts with the
          * preserveMessageQos option, which operates at message granularity,
          * reading QoS properties exclusively from the Camel In message headers.
-         * The option is a java.lang.Boolean type.
+         * The option is a <code>java.lang.Boolean</code> type.
          */
         public AMQPProducerBuilder explicitQosEnabled(Boolean explicitQosEnabled) {
             this.properties.put("explicitQosEnabled", explicitQosEnabled);
@@ -1574,7 +1608,8 @@ public interface AMQPEndpointBuilder {
          * options are applied to the current endpoint. This contrasts with the
          * preserveMessageQos option, which operates at message granularity,
          * reading QoS properties exclusively from the Camel In message headers.
-         * The option will be converted to a java.lang.Boolean type.
+         * The option will be converted to a <code>java.lang.Boolean</code>
+         * type.
          */
         public AMQPProducerBuilder explicitQosEnabled(String explicitQosEnabled) {
             this.properties.put("explicitQosEnabled", explicitQosEnabled);
@@ -1582,7 +1617,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Sets whether date headers should be formatted according to the ISO
-         * 8601 standard. The option is a boolean type.
+         * 8601 standard. The option is a <code>boolean</code> type.
          */
         public AMQPProducerBuilder formatDateHeadersToIso8601(
                 boolean formatDateHeadersToIso8601) {
@@ -1591,7 +1626,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * Sets whether date headers should be formatted according to the ISO
-         * 8601 standard. The option will be converted to a boolean type.
+         * 8601 standard. The option will be converted to a <code>boolean</code>
+         * type.
          */
         public AMQPProducerBuilder formatDateHeadersToIso8601(
                 String formatDateHeadersToIso8601) {
@@ -1607,7 +1643,8 @@ public interface AMQPEndpointBuilder {
          * the endpoint instead. So, when using this option, the headers
          * override the values from the endpoint. The explicitQosEnabled option,
          * by contrast, will only use options set on the endpoint, and not
-         * values from the message header. The option is a boolean type.
+         * values from the message header. The option is a <code>boolean</code>
+         * type.
          */
         public AMQPProducerBuilder preserveMessageQos(boolean preserveMessageQos) {
             this.properties.put("preserveMessageQos", preserveMessageQos);
@@ -1623,7 +1660,7 @@ public interface AMQPEndpointBuilder {
          * override the values from the endpoint. The explicitQosEnabled option,
          * by contrast, will only use options set on the endpoint, and not
          * values from the message header. The option will be converted to a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public AMQPProducerBuilder preserveMessageQos(String preserveMessageQos) {
             this.properties.put("preserveMessageQos", preserveMessageQos);
@@ -1633,7 +1670,7 @@ public interface AMQPEndpointBuilder {
          * Values greater than 1 specify the message priority when sending
          * (where 0 is the lowest priority and 9 is the highest). The
          * explicitQosEnabled option must also be enabled in order for this
-         * option to have any effect. The option is a int type.
+         * option to have any effect. The option is a <code>int</code> type.
          */
         public AMQPProducerBuilder priority(int priority) {
             this.properties.put("priority", priority);
@@ -1643,8 +1680,8 @@ public interface AMQPEndpointBuilder {
          * Values greater than 1 specify the message priority when sending
          * (where 0 is the lowest priority and 9 is the highest). The
          * explicitQosEnabled option must also be enabled in order for this
-         * option to have any effect. The option will be converted to a int
-         * type.
+         * option to have any effect. The option will be converted to a
+         * <code>int</code> type.
          */
         public AMQPProducerBuilder priority(String priority) {
             this.properties.put("priority", priority);
@@ -1653,7 +1690,8 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies the default number of concurrent consumers when doing
          * request/reply over JMS. See also the maxMessagesPerTask option to
-         * control dynamic scaling up/down of threads. The option is a int type.
+         * control dynamic scaling up/down of threads. The option is a
+         * <code>int</code> type.
          */
         public AMQPProducerBuilder replyToConcurrentConsumers(
                 int replyToConcurrentConsumers) {
@@ -1664,7 +1702,7 @@ public interface AMQPEndpointBuilder {
          * Specifies the default number of concurrent consumers when doing
          * request/reply over JMS. See also the maxMessagesPerTask option to
          * control dynamic scaling up/down of threads. The option will be
-         * converted to a int type.
+         * converted to a <code>int</code> type.
          */
         public AMQPProducerBuilder replyToConcurrentConsumers(
                 String replyToConcurrentConsumers) {
@@ -1674,7 +1712,8 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies the maximum number of concurrent consumers when using
          * request/reply over JMS. See also the maxMessagesPerTask option to
-         * control dynamic scaling up/down of threads. The option is a int type.
+         * control dynamic scaling up/down of threads. The option is a
+         * <code>int</code> type.
          */
         public AMQPProducerBuilder replyToMaxConcurrentConsumers(
                 int replyToMaxConcurrentConsumers) {
@@ -1685,7 +1724,7 @@ public interface AMQPEndpointBuilder {
          * Specifies the maximum number of concurrent consumers when using
          * request/reply over JMS. See also the maxMessagesPerTask option to
          * control dynamic scaling up/down of threads. The option will be
-         * converted to a int type.
+         * converted to a <code>int</code> type.
          */
         public AMQPProducerBuilder replyToMaxConcurrentConsumers(
                 String replyToMaxConcurrentConsumers) {
@@ -1695,7 +1734,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies the maximum number of concurrent consumers for continue
          * routing when timeout occurred when using request/reply over JMS. The
-         * option is a int type.
+         * option is a <code>int</code> type.
          */
         public AMQPProducerBuilder replyToOnTimeoutMaxConcurrentConsumers(
                 int replyToOnTimeoutMaxConcurrentConsumers) {
@@ -1705,7 +1744,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Specifies the maximum number of concurrent consumers for continue
          * routing when timeout occurred when using request/reply over JMS. The
-         * option will be converted to a int type.
+         * option will be converted to a <code>int</code> type.
          */
         public AMQPProducerBuilder replyToOnTimeoutMaxConcurrentConsumers(
                 String replyToOnTimeoutMaxConcurrentConsumers) {
@@ -1716,7 +1755,8 @@ public interface AMQPEndpointBuilder {
          * Provides an explicit ReplyTo destination in the JMS message, which
          * overrides the setting of replyTo. It is useful if you want to forward
          * the message to a remote Queue and receive the reply message from the
-         * ReplyTo destination. The option is a java.lang.String type.
+         * ReplyTo destination. The option is a <code>java.lang.String</code>
+         * type.
          */
         public AMQPProducerBuilder replyToOverride(String replyToOverride) {
             this.properties.put("replyToOverride", replyToOverride);
@@ -1732,7 +1772,8 @@ public interface AMQPEndpointBuilder {
          * and especially the notes about the implications if running in a
          * clustered environment, and the fact that Shared reply queues has
          * lower performance than its alternatives Temporary and Exclusive. The
-         * option is a org.apache.camel.component.jms.ReplyToType type.
+         * option is a <code>org.apache.camel.component.jms.ReplyToType</code>
+         * type.
          */
         public AMQPProducerBuilder replyToType(ReplyToType replyToType) {
             this.properties.put("replyToType", replyToType);
@@ -1749,7 +1790,7 @@ public interface AMQPEndpointBuilder {
          * clustered environment, and the fact that Shared reply queues has
          * lower performance than its alternatives Temporary and Exclusive. The
          * option will be converted to a
-         * org.apache.camel.component.jms.ReplyToType type.
+         * <code>org.apache.camel.component.jms.ReplyToType</code> type.
          */
         public AMQPProducerBuilder replyToType(String replyToType) {
             this.properties.put("replyToType", replyToType);
@@ -1761,7 +1802,7 @@ public interface AMQPEndpointBuilder {
          * the header CamelJmsRequestTimeout to override this endpoint
          * configured timeout value, and thus have per message individual
          * timeout values. See also the requestTimeoutCheckerInterval option.
-         * The option is a long type.
+         * The option is a <code>long</code> type.
          */
         public AMQPProducerBuilder requestTimeout(long requestTimeout) {
             this.properties.put("requestTimeout", requestTimeout);
@@ -1773,7 +1814,7 @@ public interface AMQPEndpointBuilder {
          * the header CamelJmsRequestTimeout to override this endpoint
          * configured timeout value, and thus have per message individual
          * timeout values. See also the requestTimeoutCheckerInterval option.
-         * The option will be converted to a long type.
+         * The option will be converted to a <code>long</code> type.
          */
         public AMQPProducerBuilder requestTimeout(String requestTimeout) {
             this.properties.put("requestTimeout", requestTimeout);
@@ -1781,7 +1822,7 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * When sending messages, specifies the time-to-live of the message (in
-         * milliseconds). The option is a long type.
+         * milliseconds). The option is a <code>long</code> type.
          */
         public AMQPProducerBuilder timeToLive(long timeToLive) {
             this.properties.put("timeToLive", timeToLive);
@@ -1789,7 +1830,8 @@ public interface AMQPEndpointBuilder {
         }
         /**
          * When sending messages, specifies the time-to-live of the message (in
-         * milliseconds). The option will be converted to a long type.
+         * milliseconds). The option will be converted to a <code>long</code>
+         * type.
          */
         public AMQPProducerBuilder timeToLive(String timeToLive) {
             this.properties.put("timeToLive", timeToLive);
@@ -1801,8 +1843,8 @@ public interface AMQPEndpointBuilder {
          * message systems such as WMQ do this with header names using prefix
          * JMS_IBM_MQMD_ containing values with byte array or other invalid
          * types. You can specify multiple header names separated by comma, and
-         * use as suffix for wildcard matching. The option is a java.lang.String
-         * type.
+         * use as suffix for wildcard matching. The option is a
+         * <code>java.lang.String</code> type.
          */
         public AMQPProducerBuilder allowAdditionalHeaders(
                 String allowAdditionalHeaders) {
@@ -1812,7 +1854,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Whether to allow sending messages with no body. If this option is
          * false and the message body is null, then an JMSException is thrown.
-         * The option is a boolean type.
+         * The option is a <code>boolean</code> type.
          */
         public AMQPProducerBuilder allowNullBody(boolean allowNullBody) {
             this.properties.put("allowNullBody", allowNullBody);
@@ -1821,7 +1863,7 @@ public interface AMQPEndpointBuilder {
         /**
          * Whether to allow sending messages with no body. If this option is
          * false and the message body is null, then an JMSException is thrown.
-         * The option will be converted to a boolean type.
+         * The option will be converted to a <code>boolean</code> type.
          */
         public AMQPProducerBuilder allowNullBody(String allowNullBody) {
             this.properties.put("allowNullBody", allowNullBody);
@@ -1833,7 +1875,8 @@ public interface AMQPEndpointBuilder {
          * needed in some situations, such as when a
          * replyToDestinationSelectorName is set (incidentally, Camel will set
          * the alwaysCopyMessage option to true, if a
-         * replyToDestinationSelectorName is set). The option is a boolean type.
+         * replyToDestinationSelectorName is set). The option is a
+         * <code>boolean</code> type.
          */
         public AMQPProducerBuilder alwaysCopyMessage(boolean alwaysCopyMessage) {
             this.properties.put("alwaysCopyMessage", alwaysCopyMessage);
@@ -1846,7 +1889,7 @@ public interface AMQPEndpointBuilder {
          * replyToDestinationSelectorName is set (incidentally, Camel will set
          * the alwaysCopyMessage option to true, if a
          * replyToDestinationSelectorName is set). The option will be converted
-         * to a boolean type.
+         * to a <code>boolean</code> type.
          */
         public AMQPProducerBuilder alwaysCopyMessage(String alwaysCopyMessage) {
             this.properties.put("alwaysCopyMessage", alwaysCopyMessage);
@@ -1859,7 +1902,7 @@ public interface AMQPEndpointBuilder {
          * using JMSCorrelationID JMS property. If used JMSCorrelationID will
          * not be used or set by Camel. The value of here named property will be
          * generated if not supplied in the header of the message under the same
-         * name. The option is a java.lang.String type.
+         * name. The option is a <code>java.lang.String</code> type.
          */
         public AMQPProducerBuilder correlationProperty(
                 String correlationProperty) {
@@ -1875,7 +1918,7 @@ public interface AMQPEndpointBuilder {
          * to archive. So you can use disableTimeToLive=true to not set a time
          * to live value on the sent message. Then the message will not expire
          * on the receiver system. See below in section About time to live for
-         * more details. The option is a boolean type.
+         * more details. The option is a <code>boolean</code> type.
          */
         public AMQPProducerBuilder disableTimeToLive(boolean disableTimeToLive) {
             this.properties.put("disableTimeToLive", disableTimeToLive);
@@ -1890,7 +1933,8 @@ public interface AMQPEndpointBuilder {
          * to archive. So you can use disableTimeToLive=true to not set a time
          * to live value on the sent message. Then the message will not expire
          * on the receiver system. See below in section About time to live for
-         * more details. The option will be converted to a boolean type.
+         * more details. The option will be converted to a <code>boolean</code>
+         * type.
          */
         public AMQPProducerBuilder disableTimeToLive(String disableTimeToLive) {
             this.properties.put("disableTimeToLive", disableTimeToLive);
@@ -1900,7 +1944,8 @@ public interface AMQPEndpointBuilder {
          * When using mapJmsMessage=false Camel will create a new JMS message to
          * send to a new JMS destination if you touch the headers (get or set)
          * during the route. Set this option to true to force Camel to send the
-         * original JMS message that was received. The option is a boolean type.
+         * original JMS message that was received. The option is a
+         * <code>boolean</code> type.
          */
         public AMQPProducerBuilder forceSendOriginalMessage(
                 boolean forceSendOriginalMessage) {
@@ -1912,7 +1957,7 @@ public interface AMQPEndpointBuilder {
          * send to a new JMS destination if you touch the headers (get or set)
          * during the route. Set this option to true to force Camel to send the
          * original JMS message that was received. The option will be converted
-         * to a boolean type.
+         * to a <code>boolean</code> type.
          */
         public AMQPProducerBuilder forceSendOriginalMessage(
                 String forceSendOriginalMessage) {
@@ -1923,8 +1968,8 @@ public interface AMQPEndpointBuilder {
          * Only applicable when sending to JMS destination using InOnly (eg fire
          * and forget). Enabling this option will enrich the Camel Exchange with
          * the actual JMSMessageID that was used by the JMS client when the
-         * message was sent to the JMS destination. The option is a boolean
-         * type.
+         * message was sent to the JMS destination. The option is a
+         * <code>boolean</code> type.
          */
         public AMQPProducerBuilder includeSentJMSMessageID(
                 boolean includeSentJMSMessageID) {
@@ -1936,7 +1981,7 @@ public interface AMQPEndpointBuilder {
          * and forget). Enabling this option will enrich the Camel Exchange with
          * the actual JMSMessageID that was used by the JMS client when the
          * message was sent to the JMS destination. The option will be converted
-         * to a boolean type.
+         * to a <code>boolean</code> type.
          */
         public AMQPProducerBuilder includeSentJMSMessageID(
                 String includeSentJMSMessageID) {
@@ -1953,7 +1998,7 @@ public interface AMQPEndpointBuilder {
          * replyToCacheLevelName=CACHE_NONE to work. Note: If using temporary
          * queues then CACHE_NONE is not allowed, and you must use a higher
          * value such as CACHE_CONSUMER or CACHE_SESSION. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public AMQPProducerBuilder replyToCacheLevelName(
                 String replyToCacheLevelName) {
@@ -1964,7 +2009,7 @@ public interface AMQPEndpointBuilder {
          * Sets the JMS Selector using the fixed name to be used so you can
          * filter out your own replies from the others when using a shared queue
          * (that is, if you are not using a temporary reply queue). The option
-         * is a java.lang.String type.
+         * is a <code>java.lang.String</code> type.
          */
         public AMQPProducerBuilder replyToDestinationSelectorName(
                 String replyToDestinationSelectorName) {
@@ -1979,7 +2024,7 @@ public interface AMQPEndpointBuilder {
          * entire message payload to be read into memory. By enabling this
          * option the message payload is read into memory in chunks and each
          * chunk is then written to the StreamMessage until no more data. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public AMQPProducerBuilder streamMessageTypeEnabled(
                 boolean streamMessageTypeEnabled) {
@@ -1994,7 +2039,7 @@ public interface AMQPEndpointBuilder {
          * entire message payload to be read into memory. By enabling this
          * option the message payload is read into memory in chunks and each
          * chunk is then written to the StreamMessage until no more data. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public AMQPProducerBuilder streamMessageTypeEnabled(
                 String streamMessageTypeEnabled) {
@@ -2004,7 +2049,7 @@ public interface AMQPEndpointBuilder {
     }
 
     public static enum JmsMessageType {
-        Bytes, Map, Object, Stream, Text;
+        Bytes, Map, Object, Stream, Text, Blob;
     }
 
     public static enum ConsumerType {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AS2EndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AS2EndpointBuilder.java
index 0e2e3c1..ab33526 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AS2EndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AS2EndpointBuilder.java
@@ -43,7 +43,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * What kind of operation to perform. The option is a
-         * org.apache.camel.component.as2.internal.AS2ApiName type.
+         * <code>org.apache.camel.component.as2.internal.AS2ApiName</code> type.
          */
         public T apiName(AS2ApiName apiName) {
             this.properties.put("apiName", apiName);
@@ -51,7 +51,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * What kind of operation to perform. The option will be converted to a
-         * org.apache.camel.component.as2.internal.AS2ApiName type.
+         * <code>org.apache.camel.component.as2.internal.AS2ApiName</code> type.
          */
         public T apiName(String apiName) {
             this.properties.put("apiName", apiName);
@@ -59,7 +59,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * What sub operation to use for the selected operation. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T methodName(String methodName) {
             this.properties.put("methodName", methodName);
@@ -67,7 +67,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The value of the AS2From header of AS2 message. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T as2From(String as2From) {
             this.properties.put("as2From", as2From);
@@ -77,7 +77,8 @@ public interface AS2EndpointBuilder {
          * The structure of AS2 Message. One of: PLAIN - No encryption, no
          * signature, SIGNED - No encryption, signature, ENCRYPTED - Encryption,
          * no signature, ENCRYPTED_SIGNED - Encryption, signature. The option is
-         * a org.apache.camel.component.as2.api.AS2MessageStructure type.
+         * a <code>org.apache.camel.component.as2.api.AS2MessageStructure</code>
+         * type.
          */
         public T as2MessageStructure(AS2MessageStructure as2MessageStructure) {
             this.properties.put("as2MessageStructure", as2MessageStructure);
@@ -88,7 +89,8 @@ public interface AS2EndpointBuilder {
          * signature, SIGNED - No encryption, signature, ENCRYPTED - Encryption,
          * no signature, ENCRYPTED_SIGNED - Encryption, signature. The option
          * will be converted to a
-         * org.apache.camel.component.as2.api.AS2MessageStructure type.
+         * <code>org.apache.camel.component.as2.api.AS2MessageStructure</code>
+         * type.
          */
         public T as2MessageStructure(String as2MessageStructure) {
             this.properties.put("as2MessageStructure", as2MessageStructure);
@@ -96,15 +98,15 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The value of the AS2To header of AS2 message. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T as2To(String as2To) {
             this.properties.put("as2To", as2To);
             return (T) this;
         }
         /**
-         * The version of the AS2 protocol. The option is a java.lang.String
-         * type.
+         * The version of the AS2 protocol. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T as2Version(String as2Version) {
             this.properties.put("as2Version", as2Version);
@@ -112,7 +114,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The Client Fully Qualified Domain Name (FQDN). Used in message ids
-         * sent by endpoint. The option is a java.lang.String type.
+         * sent by endpoint. The option is a <code>java.lang.String</code> type.
          */
         public T clientFqdn(String clientFqdn) {
             this.properties.put("clientFqdn", clientFqdn);
@@ -120,7 +122,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The algorithm used to compress EDI message. The option is a
-         * org.apache.camel.component.as2.api.AS2CompressionAlgorithm type.
+         * <code>org.apache.camel.component.as2.api.AS2CompressionAlgorithm</code> type.
          */
         public T compressionAlgorithm(
                 AS2CompressionAlgorithm compressionAlgorithm) {
@@ -130,7 +132,7 @@ public interface AS2EndpointBuilder {
         /**
          * The algorithm used to compress EDI message. The option will be
          * converted to a
-         * org.apache.camel.component.as2.api.AS2CompressionAlgorithm type.
+         * <code>org.apache.camel.component.as2.api.AS2CompressionAlgorithm</code> type.
          */
         public T compressionAlgorithm(String compressionAlgorithm) {
             this.properties.put("compressionAlgorithm", compressionAlgorithm);
@@ -138,7 +140,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The key used to encrypt the EDI message. The option is a
-         * java.security.PrivateKey type.
+         * <code>java.security.PrivateKey</code> type.
          */
         public T decryptingPrivateKey(PrivateKey decryptingPrivateKey) {
             this.properties.put("decryptingPrivateKey", decryptingPrivateKey);
@@ -146,7 +148,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The key used to encrypt the EDI message. The option will be converted
-         * to a java.security.PrivateKey type.
+         * to a <code>java.security.PrivateKey</code> type.
          */
         public T decryptingPrivateKey(String decryptingPrivateKey) {
             this.properties.put("decryptingPrivateKey", decryptingPrivateKey);
@@ -155,7 +157,8 @@ public interface AS2EndpointBuilder {
         /**
          * The value of the Disposition-Notification-To header. Assigning a
          * value to this parameter requests a message disposition notification
-         * (MDN) for the AS2 message. The option is a java.lang.String type.
+         * (MDN) for the AS2 message. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T dispositionNotificationTo(String dispositionNotificationTo) {
             this.properties.put("dispositionNotificationTo", dispositionNotificationTo);
@@ -163,7 +166,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The transfer encoding of EDI message. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T ediMessageTransferEncoding(String ediMessageTransferEncoding) {
             this.properties.put("ediMessageTransferEncoding", ediMessageTransferEncoding);
@@ -172,7 +175,7 @@ public interface AS2EndpointBuilder {
         /**
          * The content type of EDI message. One of application/edifact,
          * application/edi-x12, application/edi-consent. The option is a
-         * org.apache.http.entity.ContentType type.
+         * <code>org.apache.http.entity.ContentType</code> type.
          */
         public T ediMessageType(Object ediMessageType) {
             this.properties.put("ediMessageType", ediMessageType);
@@ -181,7 +184,7 @@ public interface AS2EndpointBuilder {
         /**
          * The content type of EDI message. One of application/edifact,
          * application/edi-x12, application/edi-consent. The option will be
-         * converted to a org.apache.http.entity.ContentType type.
+         * converted to a <code>org.apache.http.entity.ContentType</code> type.
          */
         public T ediMessageType(String ediMessageType) {
             this.properties.put("ediMessageType", ediMessageType);
@@ -189,7 +192,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The algorithm used to encrypt EDI message. The option is a
-         * org.apache.camel.component.as2.api.AS2EncryptionAlgorithm type.
+         * <code>org.apache.camel.component.as2.api.AS2EncryptionAlgorithm</code> type.
          */
         public T encryptingAlgorithm(AS2EncryptionAlgorithm encryptingAlgorithm) {
             this.properties.put("encryptingAlgorithm", encryptingAlgorithm);
@@ -198,7 +201,7 @@ public interface AS2EndpointBuilder {
         /**
          * The algorithm used to encrypt EDI message. The option will be
          * converted to a
-         * org.apache.camel.component.as2.api.AS2EncryptionAlgorithm type.
+         * <code>org.apache.camel.component.as2.api.AS2EncryptionAlgorithm</code> type.
          */
         public T encryptingAlgorithm(String encryptingAlgorithm) {
             this.properties.put("encryptingAlgorithm", encryptingAlgorithm);
@@ -206,7 +209,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The chain of certificates used to encrypt EDI message. The option is
-         * a java.security.cert.Certificate[] type.
+         * a <code>java.security.cert.Certificate[]</code> type.
          */
         public T encryptingCertificateChain(
                 Certificate[] encryptingCertificateChain) {
@@ -215,7 +218,8 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The chain of certificates used to encrypt EDI message. The option
-         * will be converted to a java.security.cert.Certificate[] type.
+         * will be converted to a <code>java.security.cert.Certificate[]</code>
+         * type.
          */
         public T encryptingCertificateChain(String encryptingCertificateChain) {
             this.properties.put("encryptingCertificateChain", encryptingCertificateChain);
@@ -223,7 +227,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The value of the From header of AS2 message. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T from(String from) {
             this.properties.put("from", from);
@@ -231,7 +235,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * Sets the name of a parameter to be passed in the exchange In Body.
-         * The option is a java.lang.String type.
+         * The option is a <code>java.lang.String</code> type.
          */
         public T inBody(String inBody) {
             this.properties.put("inBody", inBody);
@@ -239,15 +243,15 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The template used to format MDN message. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T mdnMessageTemplate(String mdnMessageTemplate) {
             this.properties.put("mdnMessageTemplate", mdnMessageTemplate);
             return (T) this;
         }
         /**
-         * The request URI of EDI message. The option is a java.lang.String
-         * type.
+         * The request URI of EDI message. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T requestUri(String requestUri) {
             this.properties.put("requestUri", requestUri);
@@ -255,7 +259,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The value included in the Server message header identifying the AS2
-         * Server. The option is a java.lang.String type.
+         * Server. The option is a <code>java.lang.String</code> type.
          */
         public T server(String server) {
             this.properties.put("server", server);
@@ -263,14 +267,15 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The Server Fully Qualified Domain Name (FQDN). Used in message ids
-         * sent by endpoint. The option is a java.lang.String type.
+         * sent by endpoint. The option is a <code>java.lang.String</code> type.
          */
         public T serverFqdn(String serverFqdn) {
             this.properties.put("serverFqdn", serverFqdn);
             return (T) this;
         }
         /**
-         * The port number of server. The option is a java.lang.Integer type.
+         * The port number of server. The option is a
+         * <code>java.lang.Integer</code> type.
          */
         public T serverPortNumber(Integer serverPortNumber) {
             this.properties.put("serverPortNumber", serverPortNumber);
@@ -278,7 +283,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The port number of server. The option will be converted to a
-         * java.lang.Integer type.
+         * <code>java.lang.Integer</code> type.
          */
         public T serverPortNumber(String serverPortNumber) {
             this.properties.put("serverPortNumber", serverPortNumber);
@@ -287,7 +292,8 @@ public interface AS2EndpointBuilder {
         /**
          * The list of algorithms, in order of preference, requested to generate
          * a message integrity check (MIC) returned in message dispostion
-         * notification (MDN). The option is a java.lang.String[] type.
+         * notification (MDN). The option is a <code>java.lang.String[]</code>
+         * type.
          */
         public T signedReceiptMicAlgorithms(String[] signedReceiptMicAlgorithms) {
             this.properties.put("signedReceiptMicAlgorithms", signedReceiptMicAlgorithms);
@@ -297,7 +303,7 @@ public interface AS2EndpointBuilder {
          * The list of algorithms, in order of preference, requested to generate
          * a message integrity check (MIC) returned in message dispostion
          * notification (MDN). The option will be converted to a
-         * java.lang.String[] type.
+         * <code>java.lang.String[]</code> type.
          */
         public T signedReceiptMicAlgorithms(String signedReceiptMicAlgorithms) {
             this.properties.put("signedReceiptMicAlgorithms", signedReceiptMicAlgorithms);
@@ -305,7 +311,8 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The algorithm used to sign EDI message. The option is a
-         * org.apache.camel.component.as2.api.AS2SignatureAlgorithm type.
+         * <code>org.apache.camel.component.as2.api.AS2SignatureAlgorithm</code>
+         * type.
          */
         public T signingAlgorithm(AS2SignatureAlgorithm signingAlgorithm) {
             this.properties.put("signingAlgorithm", signingAlgorithm);
@@ -313,7 +320,9 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The algorithm used to sign EDI message. The option will be converted
-         * to a org.apache.camel.component.as2.api.AS2SignatureAlgorithm type.
+         * to a
+         * <code>org.apache.camel.component.as2.api.AS2SignatureAlgorithm</code>
+         * type.
          */
         public T signingAlgorithm(String signingAlgorithm) {
             this.properties.put("signingAlgorithm", signingAlgorithm);
@@ -321,7 +330,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The chain of certificates used to sign EDI message. The option is a
-         * java.security.cert.Certificate[] type.
+         * <code>java.security.cert.Certificate[]</code> type.
          */
         public T signingCertificateChain(Certificate[] signingCertificateChain) {
             this.properties.put("signingCertificateChain", signingCertificateChain);
@@ -329,7 +338,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The chain of certificates used to sign EDI message. The option will
-         * be converted to a java.security.cert.Certificate[] type.
+         * be converted to a <code>java.security.cert.Certificate[]</code> type.
          */
         public T signingCertificateChain(String signingCertificateChain) {
             this.properties.put("signingCertificateChain", signingCertificateChain);
@@ -337,7 +346,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The key used to sign the EDI message. The option is a
-         * java.security.PrivateKey type.
+         * <code>java.security.PrivateKey</code> type.
          */
         public T signingPrivateKey(PrivateKey signingPrivateKey) {
             this.properties.put("signingPrivateKey", signingPrivateKey);
@@ -345,7 +354,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The key used to sign the EDI message. The option will be converted to
-         * a java.security.PrivateKey type.
+         * a <code>java.security.PrivateKey</code> type.
          */
         public T signingPrivateKey(String signingPrivateKey) {
             this.properties.put("signingPrivateKey", signingPrivateKey);
@@ -353,7 +362,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The value of Subject header of AS2 message. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T subject(String subject) {
             this.properties.put("subject", subject);
@@ -361,7 +370,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The host name (IP or DNS name) of target host. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T targetHostname(String targetHostname) {
             this.properties.put("targetHostname", targetHostname);
@@ -369,7 +378,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The port number of target host. -1 indicates the scheme default port.
-         * The option is a java.lang.Integer type.
+         * The option is a <code>java.lang.Integer</code> type.
          */
         public T targetPortNumber(Integer targetPortNumber) {
             this.properties.put("targetPortNumber", targetPortNumber);
@@ -377,7 +386,8 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The port number of target host. -1 indicates the scheme default port.
-         * The option will be converted to a java.lang.Integer type.
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
          */
         public T targetPortNumber(String targetPortNumber) {
             this.properties.put("targetPortNumber", targetPortNumber);
@@ -385,7 +395,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * The value included in the User-Agent message header identifying the
-         * AS2 user agent. The option is a java.lang.String type.
+         * AS2 user agent. The option is a <code>java.lang.String</code> type.
          */
         public T userAgent(String userAgent) {
             this.properties.put("userAgent", userAgent);
@@ -394,7 +404,7 @@ public interface AS2EndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -403,7 +413,7 @@ public interface AS2EndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -412,7 +422,7 @@ public interface AS2EndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -421,7 +431,7 @@ public interface AS2EndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -444,7 +454,7 @@ public interface AS2EndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AS2ConsumerBuilder bridgeErrorHandler(boolean bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -457,7 +467,7 @@ public interface AS2EndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AS2ConsumerBuilder bridgeErrorHandler(String bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -468,7 +478,7 @@ public interface AS2EndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AS2ConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -480,7 +490,8 @@ public interface AS2EndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AS2ConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -488,7 +499,7 @@ public interface AS2EndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AS2ConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -497,7 +508,8 @@ public interface AS2EndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AS2ConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ActiveMQEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ActiveMQEndpointBuilder.java
index e3a3f5a..69ababa 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ActiveMQEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ActiveMQEndpointBuilder.java
@@ -42,8 +42,8 @@ public interface ActiveMQEndpointBuilder {
             super("activemq", path);
         }
         /**
-         * The kind of destination to use. The option is a java.lang.String
-         * type.
+         * The kind of destination to use. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T destinationType(String destinationType) {
             this.properties.put("destinationType", destinationType);
@@ -51,7 +51,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Name of the queue or topic to use as destination. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T destinationName(String destinationName) {
             this.properties.put("destinationName", destinationName);
@@ -62,7 +62,7 @@ public interface ActiveMQEndpointBuilder {
          * must be unique and can only be used by a single JMS connection
          * instance. It is typically only required for durable topic
          * subscriptions. If using Apache ActiveMQ you may prefer to use Virtual
-         * Topics instead. The option is a java.lang.String type.
+         * Topics instead. The option is a <code>java.lang.String</code> type.
          */
         public T clientId(String clientId) {
             this.properties.put("clientId", clientId);
@@ -73,7 +73,7 @@ public interface ActiveMQEndpointBuilder {
          * factory is not specified for either
          * setTemplateConnectionFactory(ConnectionFactory) or
          * setListenerConnectionFactory(ConnectionFactory). The option is a
-         * javax.jms.ConnectionFactory type.
+         * <code>javax.jms.ConnectionFactory</code> type.
          */
         public T connectionFactory(Object connectionFactory) {
             this.properties.put("connectionFactory", connectionFactory);
@@ -84,7 +84,7 @@ public interface ActiveMQEndpointBuilder {
          * factory is not specified for either
          * setTemplateConnectionFactory(ConnectionFactory) or
          * setListenerConnectionFactory(ConnectionFactory). The option will be
-         * converted to a javax.jms.ConnectionFactory type.
+         * converted to a <code>javax.jms.ConnectionFactory</code> type.
          */
         public T connectionFactory(String connectionFactory) {
             this.properties.put("connectionFactory", connectionFactory);
@@ -99,7 +99,7 @@ public interface ActiveMQEndpointBuilder {
          * handles the reply message. You can also use this option if you want
          * to use Camel as a proxy between different message brokers and you
          * want to route message from one system to another. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T disableReplyTo(boolean disableReplyTo) {
             this.properties.put("disableReplyTo", disableReplyTo);
@@ -114,7 +114,7 @@ public interface ActiveMQEndpointBuilder {
          * handles the reply message. You can also use this option if you want
          * to use Camel as a proxy between different message brokers and you
          * want to route message from one system to another. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T disableReplyTo(String disableReplyTo) {
             this.properties.put("disableReplyTo", disableReplyTo);
@@ -123,7 +123,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * The durable subscriber name for specifying durable topic
          * subscriptions. The clientId option must be configured as well. The
-         * option is a java.lang.String type.
+         * option is a <code>java.lang.String</code> type.
          */
         public T durableSubscriptionName(String durableSubscriptionName) {
             this.properties.put("durableSubscriptionName", durableSubscriptionName);
@@ -135,7 +135,7 @@ public interface ActiveMQEndpointBuilder {
          * Map, Object, Stream, Text. By default, Camel would determine which
          * JMS message type to use from the In body type. This option allows you
          * to specify it. The option is a
-         * org.apache.camel.component.jms.JmsMessageType type.
+         * <code>org.apache.camel.component.jms.JmsMessageType</code> type.
          */
         public T jmsMessageType(JmsMessageType jmsMessageType) {
             this.properties.put("jmsMessageType", jmsMessageType);
@@ -147,7 +147,7 @@ public interface ActiveMQEndpointBuilder {
          * Map, Object, Stream, Text. By default, Camel would determine which
          * JMS message type to use from the In body type. This option allows you
          * to specify it. The option will be converted to a
-         * org.apache.camel.component.jms.JmsMessageType type.
+         * <code>org.apache.camel.component.jms.JmsMessageType</code> type.
          */
         public T jmsMessageType(String jmsMessageType) {
             this.properties.put("jmsMessageType", jmsMessageType);
@@ -159,7 +159,7 @@ public interface ActiveMQEndpointBuilder {
          * connection to the JMS broker. If a connection cannot be granted then
          * Camel throws an exception on startup. This ensures that Camel is not
          * started with failed connections. The JMS producers is tested as well.
-         * The option is a boolean type.
+         * The option is a <code>boolean</code> type.
          */
         public T testConnectionOnStartup(boolean testConnectionOnStartup) {
             this.properties.put("testConnectionOnStartup", testConnectionOnStartup);
@@ -171,7 +171,7 @@ public interface ActiveMQEndpointBuilder {
          * connection to the JMS broker. If a connection cannot be granted then
          * Camel throws an exception on startup. This ensures that Camel is not
          * started with failed connections. The JMS producers is tested as well.
-         * The option will be converted to a boolean type.
+         * The option will be converted to a <code>boolean</code> type.
          */
         public T testConnectionOnStartup(String testConnectionOnStartup) {
             this.properties.put("testConnectionOnStartup", testConnectionOnStartup);
@@ -181,7 +181,7 @@ public interface ActiveMQEndpointBuilder {
          * Controls whether or not to include serialized headers. Applies only
          * when isTransferExchange() is true. This requires that the objects are
          * serializable. Camel will exclude any non-serializable objects and log
-         * it at WARN level. The option is a boolean type.
+         * it at WARN level. The option is a <code>boolean</code> type.
          */
         public T allowSerializedHeaders(boolean allowSerializedHeaders) {
             this.properties.put("allowSerializedHeaders", allowSerializedHeaders);
@@ -191,7 +191,8 @@ public interface ActiveMQEndpointBuilder {
          * Controls whether or not to include serialized headers. Applies only
          * when isTransferExchange() is true. This requires that the objects are
          * serializable. Camel will exclude any non-serializable objects and log
-         * it at WARN level. The option will be converted to a boolean type.
+         * it at WARN level. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T allowSerializedHeaders(String allowSerializedHeaders) {
             this.properties.put("allowSerializedHeaders", allowSerializedHeaders);
@@ -208,7 +209,7 @@ public interface ActiveMQEndpointBuilder {
          * if the connection could not be established, then an exception is
          * logged at WARN level, and the consumer will not be able to receive
          * messages; You can then restart the route to retry. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T asyncStartListener(boolean asyncStartListener) {
             this.properties.put("asyncStartListener", asyncStartListener);
@@ -225,7 +226,7 @@ public interface ActiveMQEndpointBuilder {
          * if the connection could not be established, then an exception is
          * logged at WARN level, and the consumer will not be able to receive
          * messages; You can then restart the route to retry. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T asyncStartListener(String asyncStartListener) {
             this.properties.put("asyncStartListener", asyncStartListener);
@@ -233,7 +234,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Whether to stop the JmsConsumer message listener asynchronously, when
-         * stopping a route. The option is a boolean type.
+         * stopping a route. The option is a <code>boolean</code> type.
          */
         public T asyncStopListener(boolean asyncStopListener) {
             this.properties.put("asyncStopListener", asyncStopListener);
@@ -241,7 +242,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Whether to stop the JmsConsumer message listener asynchronously, when
-         * stopping a route. The option will be converted to a boolean type.
+         * stopping a route. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T asyncStopListener(String asyncStopListener) {
             this.properties.put("asyncStopListener", asyncStopListener);
@@ -250,7 +252,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -259,7 +261,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -270,7 +272,7 @@ public interface ActiveMQEndpointBuilder {
          * org.springframework.jms.support.destination.DestinationResolver that
          * allows you to use your own resolver (for example, to lookup the real
          * destination in a JNDI registry). The option is a
-         * org.springframework.jms.support.destination.DestinationResolver type.
+         * <code>org.springframework.jms.support.destination.DestinationResolver</code> type.
          */
         public T destinationResolver(Object destinationResolver) {
             this.properties.put("destinationResolver", destinationResolver);
@@ -281,7 +283,7 @@ public interface ActiveMQEndpointBuilder {
          * org.springframework.jms.support.destination.DestinationResolver that
          * allows you to use your own resolver (for example, to lookup the real
          * destination in a JNDI registry). The option will be converted to a
-         * org.springframework.jms.support.destination.DestinationResolver type.
+         * <code>org.springframework.jms.support.destination.DestinationResolver</code> type.
          */
         public T destinationResolver(String destinationResolver) {
             this.properties.put("destinationResolver", destinationResolver);
@@ -295,7 +297,7 @@ public interface ActiveMQEndpointBuilder {
          * whether stack traces should be logged using errorHandlerLoggingLevel
          * and errorHandlerLogStackTrace options. This makes it much easier to
          * configure, than having to code a custom errorHandler. The option is a
-         * org.springframework.util.ErrorHandler type.
+         * <code>org.springframework.util.ErrorHandler</code> type.
          */
         public T errorHandler(Object errorHandler) {
             this.properties.put("errorHandler", errorHandler);
@@ -309,7 +311,8 @@ public interface ActiveMQEndpointBuilder {
          * whether stack traces should be logged using errorHandlerLoggingLevel
          * and errorHandlerLogStackTrace options. This makes it much easier to
          * configure, than having to code a custom errorHandler. The option will
-         * be converted to a org.springframework.util.ErrorHandler type.
+         * be converted to a <code>org.springframework.util.ErrorHandler</code>
+         * type.
          */
         public T errorHandler(String errorHandler) {
             this.properties.put("errorHandler", errorHandler);
@@ -318,7 +321,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies the JMS Exception Listener that is to be notified of any
          * underlying JMS exceptions. The option is a
-         * javax.jms.ExceptionListener type.
+         * <code>javax.jms.ExceptionListener</code> type.
          */
         public T exceptionListener(Object exceptionListener) {
             this.properties.put("exceptionListener", exceptionListener);
@@ -327,7 +330,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies the JMS Exception Listener that is to be notified of any
          * underlying JMS exceptions. The option will be converted to a
-         * javax.jms.ExceptionListener type.
+         * <code>javax.jms.ExceptionListener</code> type.
          */
         public T exceptionListener(String exceptionListener) {
             this.properties.put("exceptionListener", exceptionListener);
@@ -336,7 +339,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * To use a custom HeaderFilterStrategy to filter header to and from
          * Camel message. The option is a
-         * org.apache.camel.spi.HeaderFilterStrategy type.
+         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
          */
         public T headerFilterStrategy(HeaderFilterStrategy headerFilterStrategy) {
             this.properties.put("headerFilterStrategy", headerFilterStrategy);
@@ -345,7 +348,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * To use a custom HeaderFilterStrategy to filter header to and from
          * Camel message. The option will be converted to a
-         * org.apache.camel.spi.HeaderFilterStrategy type.
+         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
          */
         public T headerFilterStrategy(String headerFilterStrategy) {
             this.properties.put("headerFilterStrategy", headerFilterStrategy);
@@ -353,7 +356,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specify the limit for the number of consumers that are allowed to be
-         * idle at any given time. The option is a int type.
+         * idle at any given time. The option is a <code>int</code> type.
          */
         public T idleConsumerLimit(int idleConsumerLimit) {
             this.properties.put("idleConsumerLimit", idleConsumerLimit);
@@ -361,7 +364,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specify the limit for the number of consumers that are allowed to be
-         * idle at any given time. The option will be converted to a int type.
+         * idle at any given time. The option will be converted to a
+         * <code>int</code> type.
          */
         public T idleConsumerLimit(String idleConsumerLimit) {
             this.properties.put("idleConsumerLimit", idleConsumerLimit);
@@ -373,7 +377,7 @@ public interface ActiveMQEndpointBuilder {
          * the task will shut down and leave receiving to other executing tasks
          * (in the case of dynamic scheduling; see the maxConcurrentConsumers
          * setting). There is additional doc available from Spring. The option
-         * is a int type.
+         * is a <code>int</code> type.
          */
         public T idleTaskExecutionLimit(int idleTaskExecutionLimit) {
             this.properties.put("idleTaskExecutionLimit", idleTaskExecutionLimit);
@@ -385,7 +389,7 @@ public interface ActiveMQEndpointBuilder {
          * the task will shut down and leave receiving to other executing tasks
          * (in the case of dynamic scheduling; see the maxConcurrentConsumers
          * setting). There is additional doc available from Spring. The option
-         * will be converted to a int type.
+         * will be converted to a <code>int</code> type.
          */
         public T idleTaskExecutionLimit(String idleTaskExecutionLimit) {
             this.properties.put("idleTaskExecutionLimit", idleTaskExecutionLimit);
@@ -396,7 +400,7 @@ public interface ActiveMQEndpointBuilder {
          * Camel Message. Setting this to true will include properties such as
          * JMSXAppID, and JMSXUserID etc. Note: If you are using a custom
          * headerFilterStrategy then this option does not apply. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T includeAllJMSXProperties(boolean includeAllJMSXProperties) {
             this.properties.put("includeAllJMSXProperties", includeAllJMSXProperties);
@@ -407,7 +411,7 @@ public interface ActiveMQEndpointBuilder {
          * Camel Message. Setting this to true will include properties such as
          * JMSXAppID, and JMSXUserID etc. Note: If you are using a custom
          * headerFilterStrategy then this option does not apply. The option will
-         * be converted to a boolean type.
+         * be converted to a <code>boolean</code> type.
          */
         public T includeAllJMSXProperties(String includeAllJMSXProperties) {
             this.properties.put("includeAllJMSXProperties", includeAllJMSXProperties);
@@ -422,7 +426,9 @@ public interface ActiveMQEndpointBuilder {
          * brokers which do not care whether JMS header keys contain illegal
          * characters. You can provide your own implementation of the
          * org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it
-         * using the # notation. The option is a java.lang.String type.
+         * using the # notation. The option is a
+         * <code>org.apache.camel.component.jms.JmsKeyFormatStrategy</code>
+         * type.
          */
         public T jmsKeyFormatStrategy(Object jmsKeyFormatStrategy) {
             this.properties.put("jmsKeyFormatStrategy", jmsKeyFormatStrategy);
@@ -438,7 +444,8 @@ public interface ActiveMQEndpointBuilder {
          * characters. You can provide your own implementation of the
          * org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it
          * using the # notation. The option will be converted to a
-         * java.lang.String type.
+         * <code>org.apache.camel.component.jms.JmsKeyFormatStrategy</code>
+         * type.
          */
         public T jmsKeyFormatStrategy(String jmsKeyFormatStrategy) {
             this.properties.put("jmsKeyFormatStrategy", jmsKeyFormatStrategy);
@@ -447,7 +454,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies whether Camel should auto map the received JMS message to a
          * suited payload type, such as javax.jms.TextMessage to a String etc.
-         * The option is a boolean type.
+         * The option is a <code>boolean</code> type.
          */
         public T mapJmsMessage(boolean mapJmsMessage) {
             this.properties.put("mapJmsMessage", mapJmsMessage);
@@ -456,7 +463,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies whether Camel should auto map the received JMS message to a
          * suited payload type, such as javax.jms.TextMessage to a String etc.
-         * The option will be converted to a boolean type.
+         * The option will be converted to a <code>boolean</code> type.
          */
         public T mapJmsMessage(String mapJmsMessage) {
             this.properties.put("mapJmsMessage", mapJmsMessage);
@@ -466,7 +473,8 @@ public interface ActiveMQEndpointBuilder {
          * The number of messages per task. -1 is unlimited. If you use a range
          * for concurrent consumers (eg min max), then this option can be used
          * to set a value to eg 100 to control how fast the consumers will
-         * shrink when less work is required. The option is a int type.
+         * shrink when less work is required. The option is a <code>int</code>
+         * type.
          */
         public T maxMessagesPerTask(int maxMessagesPerTask) {
             this.properties.put("maxMessagesPerTask", maxMessagesPerTask);
@@ -477,7 +485,7 @@ public interface ActiveMQEndpointBuilder {
          * for concurrent consumers (eg min max), then this option can be used
          * to set a value to eg 100 to control how fast the consumers will
          * shrink when less work is required. The option will be converted to a
-         * int type.
+         * <code>int</code> type.
          */
         public T maxMessagesPerTask(String maxMessagesPerTask) {
             this.properties.put("maxMessagesPerTask", maxMessagesPerTask);
@@ -487,7 +495,7 @@ public interface ActiveMQEndpointBuilder {
          * To use a custom Spring
          * org.springframework.jms.support.converter.MessageConverter so you can
          * be in control how to map to/from a javax.jms.Message. The option is a
-         * org.springframework.jms.support.converter.MessageConverter type.
+         * <code>org.springframework.jms.support.converter.MessageConverter</code> type.
          */
         public T messageConverter(Object messageConverter) {
             this.properties.put("messageConverter", messageConverter);
@@ -498,7 +506,7 @@ public interface ActiveMQEndpointBuilder {
          * org.springframework.jms.support.converter.MessageConverter so you can
          * be in control how to map to/from a javax.jms.Message. The option will
          * be converted to a
-         * org.springframework.jms.support.converter.MessageConverter type.
+         * <code>org.springframework.jms.support.converter.MessageConverter</code> type.
          */
         public T messageConverter(String messageConverter) {
             this.properties.put("messageConverter", messageConverter);
@@ -508,7 +516,8 @@ public interface ActiveMQEndpointBuilder {
          * To use the given MessageCreatedStrategy which are invoked when Camel
          * creates new instances of javax.jms.Message objects when Camel is
          * sending a JMS message. The option is a
-         * org.apache.camel.component.jms.MessageCreatedStrategy type.
+         * <code>org.apache.camel.component.jms.MessageCreatedStrategy</code>
+         * type.
          */
         public T messageCreatedStrategy(Object messageCreatedStrategy) {
             this.properties.put("messageCreatedStrategy", messageCreatedStrategy);
@@ -518,7 +527,8 @@ public interface ActiveMQEndpointBuilder {
          * To use the given MessageCreatedStrategy which are invoked when Camel
          * creates new instances of javax.jms.Message objects when Camel is
          * sending a JMS message. The option will be converted to a
-         * org.apache.camel.component.jms.MessageCreatedStrategy type.
+         * <code>org.apache.camel.component.jms.MessageCreatedStrategy</code>
+         * type.
          */
         public T messageCreatedStrategy(String messageCreatedStrategy) {
             this.properties.put("messageCreatedStrategy", messageCreatedStrategy);
@@ -529,7 +539,7 @@ public interface ActiveMQEndpointBuilder {
          * just an hint to the JMS Broker. If the JMS provider accepts this
          * hint, these messages must have the message ID set to null; if the
          * provider ignores the hint, the message ID must be set to its normal
-         * unique value. The option is a boolean type.
+         * unique value. The option is a <code>boolean</code> type.
          */
         public T messageIdEnabled(boolean messageIdEnabled) {
             this.properties.put("messageIdEnabled", messageIdEnabled);
@@ -540,7 +550,8 @@ public interface ActiveMQEndpointBuilder {
          * just an hint to the JMS Broker. If the JMS provider accepts this
          * hint, these messages must have the message ID set to null; if the
          * provider ignores the hint, the message ID must be set to its normal
-         * unique value. The option will be converted to a boolean type.
+         * unique value. The option will be converted to a <code>boolean</code>
+         * type.
          */
         public T messageIdEnabled(String messageIdEnabled) {
             this.properties.put("messageIdEnabled", messageIdEnabled);
@@ -552,7 +563,7 @@ public interface ActiveMQEndpointBuilder {
          * org.springframework.jms.listener.AbstractMessageListenerContainer to
          * use to consume messages. Setting this will automatically set
          * consumerType to Custom. The option is a
-         * org.apache.camel.component.jms.MessageListenerContainerFactory type.
+         * <code>org.apache.camel.component.jms.MessageListenerContainerFactory</code> type.
          */
         public T messageListenerContainerFactory(
                 Object messageListenerContainerFactory) {
@@ -565,7 +576,7 @@ public interface ActiveMQEndpointBuilder {
          * org.springframework.jms.listener.AbstractMessageListenerContainer to
          * use to consume messages. Setting this will automatically set
          * consumerType to Custom. The option will be converted to a
-         * org.apache.camel.component.jms.MessageListenerContainerFactory type.
+         * <code>org.apache.camel.component.jms.MessageListenerContainerFactory</code> type.
          */
         public T messageListenerContainerFactory(
                 String messageListenerContainerFactory) {
@@ -577,7 +588,7 @@ public interface ActiveMQEndpointBuilder {
          * messages. This is just an hint to the JMS Broker. If the JMS provider
          * accepts this hint, these messages must have the timestamp set to
          * zero; if the provider ignores the hint, the timestamp must be set to
-         * its normal value. The option is a boolean type.
+         * its normal value. The option is a <code>boolean</code> type.
          */
         public T messageTimestampEnabled(boolean messageTimestampEnabled) {
             this.properties.put("messageTimestampEnabled", messageTimestampEnabled);
@@ -588,7 +599,8 @@ public interface ActiveMQEndpointBuilder {
          * messages. This is just an hint to the JMS Broker. If the JMS provider
          * accepts this hint, these messages must have the timestamp set to
          * zero; if the provider ignores the hint, the timestamp must be set to
-         * its normal value. The option will be converted to a boolean type.
+         * its normal value. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T messageTimestampEnabled(String messageTimestampEnabled) {
             this.properties.put("messageTimestampEnabled", messageTimestampEnabled);
@@ -596,7 +608,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether to inhibit the delivery of messages published by
-         * its own connection. The option is a boolean type.
+         * its own connection. The option is a <code>boolean</code> type.
          */
         public T pubSubNoLocal(boolean pubSubNoLocal) {
             this.properties.put("pubSubNoLocal", pubSubNoLocal);
@@ -604,7 +616,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether to inhibit the delivery of messages published by
-         * its own connection. The option will be converted to a boolean type.
+         * its own connection. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T pubSubNoLocal(String pubSubNoLocal) {
             this.properties.put("pubSubNoLocal", pubSubNoLocal);
@@ -612,7 +625,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * The timeout for receiving messages (in milliseconds). The option is a
-         * long type.
+         * <code>long</code> type.
          */
         public T receiveTimeout(long receiveTimeout) {
             this.properties.put("receiveTimeout", receiveTimeout);
@@ -620,7 +633,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * The timeout for receiving messages (in milliseconds). The option will
-         * be converted to a long type.
+         * be converted to a <code>long</code> type.
          */
         public T receiveTimeout(String receiveTimeout) {
             this.properties.put("receiveTimeout", receiveTimeout);
@@ -629,7 +642,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies the interval between recovery attempts, i.e. when a
          * connection is being refreshed, in milliseconds. The default is 5000
-         * ms, that is, 5 seconds. The option is a long type.
+         * ms, that is, 5 seconds. The option is a <code>long</code> type.
          */
         public T recoveryInterval(long recoveryInterval) {
             this.properties.put("recoveryInterval", recoveryInterval);
@@ -638,7 +651,8 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies the interval between recovery attempts, i.e. when a
          * connection is being refreshed, in milliseconds. The default is 5000
-         * ms, that is, 5 seconds. The option will be converted to a long type.
+         * ms, that is, 5 seconds. The option will be converted to a
+         * <code>long</code> type.
          */
         public T recoveryInterval(String recoveryInterval) {
             this.properties.put("recoveryInterval", recoveryInterval);
@@ -649,7 +663,8 @@ public interface ActiveMQEndpointBuilder {
          * doing request/reply over JMS. By default Camel checks once per
          * second. But if you must react faster when a timeout occurs, then you
          * can lower this interval, to check more frequently. The timeout is
-         * determined by the option requestTimeout. The option is a long type.
+         * determined by the option requestTimeout. The option is a
+         * <code>long</code> type.
          */
         public T requestTimeoutCheckerInterval(
                 long requestTimeoutCheckerInterval) {
@@ -662,7 +677,7 @@ public interface ActiveMQEndpointBuilder {
          * second. But if you must react faster when a timeout occurs, then you
          * can lower this interval, to check more frequently. The timeout is
          * determined by the option requestTimeout. The option will be converted
-         * to a long type.
+         * to a <code>long</code> type.
          */
         public T requestTimeoutCheckerInterval(
                 String requestTimeoutCheckerInterval) {
@@ -672,7 +687,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -681,7 +696,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -698,7 +713,7 @@ public interface ActiveMQEndpointBuilder {
          * exception is required to be serializable. The original Exception on
          * the consumer side can be wrapped in an outer exception such as
          * org.apache.camel.RuntimeCamelException when returned to the producer.
-         * The option is a boolean type.
+         * The option is a <code>boolean</code> type.
          */
         public T transferException(boolean transferException) {
             this.properties.put("transferException", transferException);
@@ -715,7 +730,7 @@ public interface ActiveMQEndpointBuilder {
          * exception is required to be serializable. The original Exception on
          * the consumer side can be wrapped in an outer exception such as
          * org.apache.camel.RuntimeCamelException when returned to the producer.
-         * The option will be converted to a boolean type.
+         * The option will be converted to a <code>boolean</code> type.
          */
         public T transferException(String transferException) {
             this.properties.put("transferException", transferException);
@@ -729,7 +744,7 @@ public interface ActiveMQEndpointBuilder {
          * serializable. Camel will exclude any non-serializable objects and log
          * it at WARN level. You must enable this option on both the producer
          * and consumer side, so Camel knows the payloads is an Exchange and not
-         * a regular payload. The option is a boolean type.
+         * a regular payload. The option is a <code>boolean</code> type.
          */
         public T transferExchange(boolean transferExchange) {
             this.properties.put("transferExchange", transferExchange);
@@ -743,7 +758,8 @@ public interface ActiveMQEndpointBuilder {
          * serializable. Camel will exclude any non-serializable objects and log
          * it at WARN level. You must enable this option on both the producer
          * and consumer side, so Camel knows the payloads is an Exchange and not
-         * a regular payload. The option will be converted to a boolean type.
+         * a regular payload. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T transferExchange(String transferExchange) {
             this.properties.put("transferExchange", transferExchange);
@@ -758,7 +774,8 @@ public interface ActiveMQEndpointBuilder {
          * fault flag will be set on the
          * org.apache.camel.Message#setFault(boolean). You may want to enable
          * this when using Camel components that support faults such as SOAP
-         * based such as cxf or spring-ws. The option is a boolean type.
+         * based such as cxf or spring-ws. The option is a <code>boolean</code>
+         * type.
          */
         public T transferFault(boolean transferFault) {
             this.properties.put("transferFault", transferFault);
@@ -774,7 +791,7 @@ public interface ActiveMQEndpointBuilder {
          * org.apache.camel.Message#setFault(boolean). You may want to enable
          * this when using Camel components that support faults such as SOAP
          * based such as cxf or spring-ws. The option will be converted to a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T transferFault(String transferFault) {
             this.properties.put("transferFault", transferFault);
@@ -782,7 +799,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether JMSMessageID should always be used as
-         * JMSCorrelationID for InOut messages. The option is a boolean type.
+         * JMSCorrelationID for InOut messages. The option is a
+         * <code>boolean</code> type.
          */
         public T useMessageIDAsCorrelationID(boolean useMessageIDAsCorrelationID) {
             this.properties.put("useMessageIDAsCorrelationID", useMessageIDAsCorrelationID);
@@ -791,7 +809,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies whether JMSMessageID should always be used as
          * JMSCorrelationID for InOut messages. The option will be converted to
-         * a boolean type.
+         * a <code>boolean</code> type.
          */
         public T useMessageIDAsCorrelationID(String useMessageIDAsCorrelationID) {
             this.properties.put("useMessageIDAsCorrelationID", useMessageIDAsCorrelationID);
@@ -801,7 +819,7 @@ public interface ActiveMQEndpointBuilder {
          * Number of times to wait for provisional correlation id to be updated
          * to the actual correlation id when doing request/reply over JMS and
          * when the option useMessageIDAsCorrelationID is enabled. The option is
-         * a int type.
+         * a <code>int</code> type.
          */
         public T waitForProvisionCorrelationToBeUpdatedCounter(
                 int waitForProvisionCorrelationToBeUpdatedCounter) {
@@ -812,7 +830,7 @@ public interface ActiveMQEndpointBuilder {
          * Number of times to wait for provisional correlation id to be updated
          * to the actual correlation id when doing request/reply over JMS and
          * when the option useMessageIDAsCorrelationID is enabled. The option
-         * will be converted to a int type.
+         * will be converted to a <code>int</code> type.
          */
         public T waitForProvisionCorrelationToBeUpdatedCounter(
                 String waitForProvisionCorrelationToBeUpdatedCounter) {
@@ -821,7 +839,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Interval in millis to sleep each time while waiting for provisional
-         * correlation id to be updated. The option is a long type.
+         * correlation id to be updated. The option is a <code>long</code> type.
          */
         public T waitForProvisionCorrelationToBeUpdatedThreadSleepingTime(
                 long waitForProvisionCorrelationToBeUpdatedThreadSleepingTime) {
@@ -830,8 +848,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Interval in millis to sleep each time while waiting for provisional
-         * correlation id to be updated. The option will be converted to a long
-         * type.
+         * correlation id to be updated. The option will be converted to a
+         * <code>long</code> type.
          */
         public T waitForProvisionCorrelationToBeUpdatedThreadSleepingTime(
                 String waitForProvisionCorrelationToBeUpdatedThreadSleepingTime) {
@@ -841,7 +859,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Password to use with the ConnectionFactory. You can also configure
          * username/password directly on the ConnectionFactory. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T password(String password) {
             this.properties.put("password", password);
@@ -850,15 +868,15 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Username to use with the ConnectionFactory. You can also configure
          * username/password directly on the ConnectionFactory. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T username(String username) {
             this.properties.put("username", username);
             return (T) this;
         }
         /**
-         * Specifies whether to use transacted mode. The option is a boolean
-         * type.
+         * Specifies whether to use transacted mode. The option is a
+         * <code>boolean</code> type.
          */
         public T transacted(boolean transacted) {
             this.properties.put("transacted", transacted);
@@ -866,7 +884,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether to use transacted mode. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T transacted(String transacted) {
             this.properties.put("transacted", transacted);
@@ -875,7 +893,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * If true, Camel will create a JmsTransactionManager, if there is no
          * transactionManager injected when option transacted=true. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T lazyCreateTransactionManager(
                 boolean lazyCreateTransactionManager) {
@@ -885,7 +903,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * If true, Camel will create a JmsTransactionManager, if there is no
          * transactionManager injected when option transacted=true. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T lazyCreateTransactionManager(
                 String lazyCreateTransactionManager) {
@@ -894,7 +912,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * The Spring transaction manager to use. The option is a
-         * org.springframework.transaction.PlatformTransactionManager type.
+         * <code>org.springframework.transaction.PlatformTransactionManager</code> type.
          */
         public T transactionManager(Object transactionManager) {
             this.properties.put("transactionManager", transactionManager);
@@ -902,15 +920,16 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * The Spring transaction manager to use. The option will be converted
-         * to a org.springframework.transaction.PlatformTransactionManager type.
+         * to a
+         * <code>org.springframework.transaction.PlatformTransactionManager</code> type.
          */
         public T transactionManager(String transactionManager) {
             this.properties.put("transactionManager", transactionManager);
             return (T) this;
         }
         /**
-         * The name of the transaction to use. The option is a java.lang.String
-         * type.
+         * The name of the transaction to use. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T transactionName(String transactionName) {
             this.properties.put("transactionName", transactionName);
@@ -918,7 +937,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * The timeout value of the transaction (in seconds), if using
-         * transacted mode. The option is a int type.
+         * transacted mode. The option is a <code>int</code> type.
          */
         public T transactionTimeout(int transactionTimeout) {
             this.properties.put("transactionTimeout", transactionTimeout);
@@ -926,7 +945,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * The timeout value of the transaction (in seconds), if using
-         * transacted mode. The option will be converted to a int type.
+         * transacted mode. The option will be converted to a <code>int</code>
+         * type.
          */
         public T transactionTimeout(String transactionTimeout) {
             this.properties.put("transactionTimeout", transactionTimeout);
@@ -945,7 +965,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * The JMS acknowledgement name, which is one of: SESSION_TRANSACTED,
          * CLIENT_ACKNOWLEDGE, AUTO_ACKNOWLEDGE, DUPS_OK_ACKNOWLEDGE. The option
-         * is a java.lang.String type.
+         * is a <code>java.lang.String</code> type.
          */
         public ActiveMQConsumerBuilder acknowledgementModeName(
                 String acknowledgementModeName) {
@@ -962,7 +982,7 @@ public interface ActiveMQEndpointBuilder {
          * the next message from the JMS queue. Note if transacted has been
          * enabled, then asyncConsumer=true does not run asynchronously, as
          * transaction must be executed synchronously (Camel 3.0 may support
-         * async transactions). The option is a boolean type.
+         * async transactions). The option is a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder asyncConsumer(boolean asyncConsumer) {
             this.properties.put("asyncConsumer", asyncConsumer);
@@ -978,7 +998,8 @@ public interface ActiveMQEndpointBuilder {
          * the next message from the JMS queue. Note if transacted has been
          * enabled, then asyncConsumer=true does not run asynchronously, as
          * transaction must be executed synchronously (Camel 3.0 may support
-         * async transactions). The option will be converted to a boolean type.
+         * async transactions). The option will be converted to a
+         * <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder asyncConsumer(String asyncConsumer) {
             this.properties.put("asyncConsumer", asyncConsumer);
@@ -986,7 +1007,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether the consumer container should auto-startup. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder autoStartup(boolean autoStartup) {
             this.properties.put("autoStartup", autoStartup);
@@ -994,7 +1015,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether the consumer container should auto-startup. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder autoStartup(String autoStartup) {
             this.properties.put("autoStartup", autoStartup);
@@ -1007,7 +1028,7 @@ public interface ActiveMQEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -1021,7 +1042,7 @@ public interface ActiveMQEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -1030,7 +1051,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Sets the cache level by ID for the underlying JMS resources. See
-         * cacheLevelName option for more details. The option is a int type.
+         * cacheLevelName option for more details. The option is a
+         * <code>int</code> type.
          */
         public ActiveMQConsumerBuilder cacheLevel(int cacheLevel) {
             this.properties.put("cacheLevel", cacheLevel);
@@ -1039,7 +1061,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Sets the cache level by ID for the underlying JMS resources. See
          * cacheLevelName option for more details. The option will be converted
-         * to a int type.
+         * to a <code>int</code> type.
          */
         public ActiveMQConsumerBuilder cacheLevel(String cacheLevel) {
             this.properties.put("cacheLevel", cacheLevel);
@@ -1050,7 +1072,7 @@ public interface ActiveMQEndpointBuilder {
          * Possible values are: CACHE_AUTO, CACHE_CONNECTION, CACHE_CONSUMER,
          * CACHE_NONE, and CACHE_SESSION. The default setting is CACHE_AUTO. See
          * the Spring documentation and Transactions Cache Levels for more
-         * information. The option is a java.lang.String type.
+         * information. The option is a <code>java.lang.String</code> type.
          */
         public ActiveMQConsumerBuilder cacheLevelName(String cacheLevelName) {
             this.properties.put("cacheLevelName", cacheLevelName);
@@ -1062,7 +1084,8 @@ public interface ActiveMQEndpointBuilder {
          * maxMessagesPerTask option to control dynamic scaling up/down of
          * threads. When doing request/reply over JMS then the option
          * replyToConcurrentConsumers is used to control number of concurrent
-         * consumers on the reply message listener. The option is a int type.
+         * consumers on the reply message listener. The option is a
+         * <code>int</code> type.
          */
         public ActiveMQConsumerBuilder concurrentConsumers(
                 int concurrentConsumers) {
@@ -1076,7 +1099,7 @@ public interface ActiveMQEndpointBuilder {
          * threads. When doing request/reply over JMS then the option
          * replyToConcurrentConsumers is used to control number of concurrent
          * consumers on the reply message listener. The option will be converted
-         * to a int type.
+         * to a <code>int</code> type.
          */
         public ActiveMQConsumerBuilder concurrentConsumers(
                 String concurrentConsumers) {
@@ -1089,7 +1112,8 @@ public interface ActiveMQEndpointBuilder {
          * maxMessagesPerTask option to control dynamic scaling up/down of
          * threads. When doing request/reply over JMS then the option
          * replyToMaxConcurrentConsumers is used to control number of concurrent
-         * consumers on the reply message listener. The option is a int type.
+         * consumers on the reply message listener. The option is a
+         * <code>int</code> type.
          */
         public ActiveMQConsumerBuilder maxConcurrentConsumers(
                 int maxConcurrentConsumers) {
@@ -1103,7 +1127,7 @@ public interface ActiveMQEndpointBuilder {
          * threads. When doing request/reply over JMS then the option
          * replyToMaxConcurrentConsumers is used to control number of concurrent
          * consumers on the reply message listener. The option will be converted
-         * to a int type.
+         * to a <code>int</code> type.
          */
         public ActiveMQConsumerBuilder maxConcurrentConsumers(
                 String maxConcurrentConsumers) {
@@ -1113,7 +1137,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Provides an explicit ReplyTo destination, which overrides any
          * incoming value of Message.getJMSReplyTo(). The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public ActiveMQConsumerBuilder replyTo(String replyTo) {
             this.properties.put("replyTo", replyTo);
@@ -1121,7 +1145,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether to use persistent delivery by default for replies.
-         * The option is a boolean type.
+         * The option is a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder replyToDeliveryPersistent(
                 boolean replyToDeliveryPersistent) {
@@ -1130,7 +1154,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether to use persistent delivery by default for replies.
-         * The option will be converted to a boolean type.
+         * The option will be converted to a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder replyToDeliveryPersistent(
                 String replyToDeliveryPersistent) {
@@ -1138,7 +1162,8 @@ public interface ActiveMQEndpointBuilder {
             return (ActiveMQConsumerBuilder) this;
         }
         /**
-         * Sets the JMS selector to use. The option is a java.lang.String type.
+         * Sets the JMS selector to use. The option is a
+         * <code>java.lang.String</code> type.
          */
         public ActiveMQConsumerBuilder selector(String selector) {
             this.properties.put("selector", selector);
@@ -1152,7 +1177,7 @@ public interface ActiveMQEndpointBuilder {
          * subscriptionName value (unless your message listener class name is
          * good enough as subscription name). Only makes sense when listening to
          * a topic (pub-sub domain), therefore this method switches the
-         * pubSubDomain flag as well. The option is a boolean type.
+         * pubSubDomain flag as well. The option is a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder subscriptionDurable(
                 boolean subscriptionDurable) {
@@ -1167,8 +1192,8 @@ public interface ActiveMQEndpointBuilder {
          * subscriptionName value (unless your message listener class name is
          * good enough as subscription name). Only makes sense when listening to
          * a topic (pub-sub domain), therefore this method switches the
-         * pubSubDomain flag as well. The option will be converted to a boolean
-         * type.
+         * pubSubDomain flag as well. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder subscriptionDurable(
                 String subscriptionDurable) {
@@ -1183,7 +1208,7 @@ public interface ActiveMQEndpointBuilder {
          * Note: Only 1 concurrent consumer (which is the default of this
          * message listener container) is allowed for each subscription, except
          * for a shared subscription (which requires JMS 2.0). The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public ActiveMQConsumerBuilder subscriptionName(String subscriptionName) {
             this.properties.put("subscriptionName", subscriptionName);
@@ -1200,7 +1225,7 @@ public interface ActiveMQEndpointBuilder {
          * subscriptionDurable as well. Only makes sense when listening to a
          * topic (pub-sub domain), therefore this method switches the
          * pubSubDomain flag as well. Requires a JMS 2.0 compatible message
-         * broker. The option is a boolean type.
+         * broker. The option is a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder subscriptionShared(
                 boolean subscriptionShared) {
@@ -1218,7 +1243,7 @@ public interface ActiveMQEndpointBuilder {
          * subscriptionDurable as well. Only makes sense when listening to a
          * topic (pub-sub domain), therefore this method switches the
          * pubSubDomain flag as well. Requires a JMS 2.0 compatible message
-         * broker. The option will be converted to a boolean type.
+         * broker. The option will be converted to a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder subscriptionShared(
                 String subscriptionShared) {
@@ -1234,7 +1259,7 @@ public interface ActiveMQEndpointBuilder {
          * redeliveries, which yet again may be rejected, and eventually the
          * message may be moved at a dead letter queue on the JMS broker. To
          * avoid this its recommended to enable this option. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder acceptMessagesWhileStopping(
                 boolean acceptMessagesWhileStopping) {
@@ -1250,7 +1275,7 @@ public interface ActiveMQEndpointBuilder {
          * redeliveries, which yet again may be rejected, and eventually the
          * message may be moved at a dead letter queue on the JMS broker. To
          * avoid this its recommended to enable this option. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder acceptMessagesWhileStopping(
                 String acceptMessagesWhileStopping) {
@@ -1265,7 +1290,7 @@ public interface ActiveMQEndpointBuilder {
          * and org.apache.camel.CamelContext is currently being stopped. This
          * quick stop ability is enabled by default in the regular JMS consumers
          * but to enable for reply managers you must enable this flag. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder allowReplyManagerQuickStop(
                 boolean allowReplyManagerQuickStop) {
@@ -1280,7 +1305,7 @@ public interface ActiveMQEndpointBuilder {
          * and org.apache.camel.CamelContext is currently being stopped. This
          * quick stop ability is enabled by default in the regular JMS consumers
          * but to enable for reply managers you must enable this flag. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder allowReplyManagerQuickStop(
                 String allowReplyManagerQuickStop) {
@@ -1297,8 +1322,8 @@ public interface ActiveMQEndpointBuilder {
          * Custom is specified, the MessageListenerContainerFactory defined by
          * the messageListenerContainerFactory option will determine what
          * org.springframework.jms.listener.AbstractMessageListenerContainer to
-         * use. The option is a org.apache.camel.component.jms.ConsumerType
-         * type.
+         * use. The option is a
+         * <code>org.apache.camel.component.jms.ConsumerType</code> type.
          */
         public ActiveMQConsumerBuilder consumerType(ConsumerType consumerType) {
             this.properties.put("consumerType", consumerType);
@@ -1315,7 +1340,7 @@ public interface ActiveMQEndpointBuilder {
          * the messageListenerContainerFactory option will determine what
          * org.springframework.jms.listener.AbstractMessageListenerContainer to
          * use. The option will be converted to a
-         * org.apache.camel.component.jms.ConsumerType type.
+         * <code>org.apache.camel.component.jms.ConsumerType</code> type.
          */
         public ActiveMQConsumerBuilder consumerType(String consumerType) {
             this.properties.put("consumerType", consumerType);
@@ -1332,7 +1357,8 @@ public interface ActiveMQEndpointBuilder {
          * consumers. The use of ThreadPool is recommended to reduce thread
          * trash in elastic configurations with dynamically increasing and
          * decreasing concurrent consumers. The option is a
-         * org.apache.camel.component.jms.DefaultTaskExecutorType type.
+         * <code>org.apache.camel.component.jms.DefaultTaskExecutorType</code>
+         * type.
          */
         public ActiveMQConsumerBuilder defaultTaskExecutorType(
                 DefaultTaskExecutorType defaultTaskExecutorType) {
@@ -1350,7 +1376,8 @@ public interface ActiveMQEndpointBuilder {
          * consumers. The use of ThreadPool is recommended to reduce thread
          * trash in elastic configurations with dynamically increasing and
          * decreasing concurrent consumers. The option will be converted to a
-         * org.apache.camel.component.jms.DefaultTaskExecutorType type.
+         * <code>org.apache.camel.component.jms.DefaultTaskExecutorType</code>
+         * type.
          */
         public ActiveMQConsumerBuilder defaultTaskExecutorType(
                 String defaultTaskExecutorType) {
@@ -1362,7 +1389,7 @@ public interface ActiveMQEndpointBuilder {
          * message is loaded which generally is inefficient as the JMS
          * properties may not be required but sometimes can catch early any
          * issues with the underlying JMS provider and the use of JMS
-         * properties. The option is a boolean type.
+         * properties. The option is a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder eagerLoadingOfProperties(
                 boolean eagerLoadingOfProperties) {
@@ -1374,7 +1401,8 @@ public interface ActiveMQEndpointBuilder {
          * message is loaded which generally is inefficient as the JMS
          * properties may not be required but sometimes can catch early any
          * issues with the underlying JMS provider and the use of JMS
-         * properties. The option will be converted to a boolean type.
+         * properties. The option will be converted to a <code>boolean</code>
+         * type.
          */
         public ActiveMQConsumerBuilder eagerLoadingOfProperties(
                 String eagerLoadingOfProperties) {
@@ -1386,7 +1414,7 @@ public interface ActiveMQEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public ActiveMQConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -1398,7 +1426,8 @@ public interface ActiveMQEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public ActiveMQConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -1406,7 +1435,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public ActiveMQConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -1415,7 +1444,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public ActiveMQConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
@@ -1423,7 +1453,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether the listener session should be exposed when
-         * consuming messages. The option is a boolean type.
+         * consuming messages. The option is a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder exposeListenerSession(
                 boolean exposeListenerSession) {
@@ -1432,7 +1462,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether the listener session should be exposed when
-         * consuming messages. The option will be converted to a boolean type.
+         * consuming messages. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder exposeListenerSession(
                 String exposeListenerSession) {
@@ -1443,7 +1474,7 @@ public interface ActiveMQEndpointBuilder {
          * Whether a JMS consumer is allowed to send a reply message to the same
          * destination that the consumer is using to consume from. This prevents
          * an endless loop by consuming and sending back the same message to
-         * itself. The option is a boolean type.
+         * itself. The option is a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder replyToSameDestinationAllowed(
                 boolean replyToSameDestinationAllowed) {
@@ -1454,7 +1485,7 @@ public interface ActiveMQEndpointBuilder {
          * Whether a JMS consumer is allowed to send a reply message to the same
          * destination that the consumer is using to consume from. This prevents
          * an endless loop by consuming and sending back the same message to
-         * itself. The option will be converted to a boolean type.
+         * itself. The option will be converted to a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder replyToSameDestinationAllowed(
                 String replyToSameDestinationAllowed) {
@@ -1463,7 +1494,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Allows you to specify a custom task executor for consuming messages.
-         * The option is a org.springframework.core.task.TaskExecutor type.
+         * The option is a
+         * <code>org.springframework.core.task.TaskExecutor</code> type.
          */
         public ActiveMQConsumerBuilder taskExecutor(Object taskExecutor) {
             this.properties.put("taskExecutor", taskExecutor);
@@ -1472,7 +1504,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Allows you to specify a custom task executor for consuming messages.
          * The option will be converted to a
-         * org.springframework.core.task.TaskExecutor type.
+         * <code>org.springframework.core.task.TaskExecutor</code> type.
          */
         public ActiveMQConsumerBuilder taskExecutor(String taskExecutor) {
             this.properties.put("taskExecutor", taskExecutor);
@@ -1481,7 +1513,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Allows to configure the default errorHandler logging level for
          * logging uncaught exceptions. The option is a
-         * org.apache.camel.LoggingLevel type.
+         * <code>org.apache.camel.LoggingLevel</code> type.
          */
         public ActiveMQConsumerBuilder errorHandlerLoggingLevel(
                 LoggingLevel errorHandlerLoggingLevel) {
@@ -1491,7 +1523,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Allows to configure the default errorHandler logging level for
          * logging uncaught exceptions. The option will be converted to a
-         * org.apache.camel.LoggingLevel type.
+         * <code>org.apache.camel.LoggingLevel</code> type.
          */
         public ActiveMQConsumerBuilder errorHandlerLoggingLevel(
                 String errorHandlerLoggingLevel) {
@@ -1500,7 +1532,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Allows to control whether stacktraces should be logged or not, by the
-         * default errorHandler. The option is a boolean type.
+         * default errorHandler. The option is a <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder errorHandlerLogStackTrace(
                 boolean errorHandlerLogStackTrace) {
@@ -1509,7 +1541,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Allows to control whether stacktraces should be logged or not, by the
-         * default errorHandler. The option will be converted to a boolean type.
+         * default errorHandler. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public ActiveMQConsumerBuilder errorHandlerLogStackTrace(
                 String errorHandlerLogStackTrace) {
@@ -1529,7 +1562,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies the delivery mode to be used. Possibles values are those
          * defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT
-         * = 2. The option is a java.lang.Integer type.
+         * = 2. The option is a <code>java.lang.Integer</code> type.
          */
         public ActiveMQProducerBuilder deliveryMode(Integer deliveryMode) {
             this.properties.put("deliveryMode", deliveryMode);
@@ -1538,7 +1571,8 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies the delivery mode to be used. Possibles values are those
          * defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT
-         * = 2. The option will be converted to a java.lang.Integer type.
+         * = 2. The option will be converted to a <code>java.lang.Integer</code>
+         * type.
          */
         public ActiveMQProducerBuilder deliveryMode(String deliveryMode) {
             this.properties.put("deliveryMode", deliveryMode);
@@ -1546,7 +1580,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether persistent delivery is used by default. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder deliveryPersistent(
                 boolean deliveryPersistent) {
@@ -1555,7 +1589,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Specifies whether persistent delivery is used by default. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder deliveryPersistent(
                 String deliveryPersistent) {
@@ -1569,7 +1603,7 @@ public interface ActiveMQEndpointBuilder {
          * options are applied to the current endpoint. This contrasts with the
          * preserveMessageQos option, which operates at message granularity,
          * reading QoS properties exclusively from the Camel In message headers.
-         * The option is a java.lang.Boolean type.
+         * The option is a <code>java.lang.Boolean</code> type.
          */
         public ActiveMQProducerBuilder explicitQosEnabled(
                 Boolean explicitQosEnabled) {
@@ -1583,7 +1617,8 @@ public interface ActiveMQEndpointBuilder {
          * options are applied to the current endpoint. This contrasts with the
          * preserveMessageQos option, which operates at message granularity,
          * reading QoS properties exclusively from the Camel In message headers.
-         * The option will be converted to a java.lang.Boolean type.
+         * The option will be converted to a <code>java.lang.Boolean</code>
+         * type.
          */
         public ActiveMQProducerBuilder explicitQosEnabled(
                 String explicitQosEnabled) {
@@ -1592,7 +1627,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Sets whether date headers should be formatted according to the ISO
-         * 8601 standard. The option is a boolean type.
+         * 8601 standard. The option is a <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder formatDateHeadersToIso8601(
                 boolean formatDateHeadersToIso8601) {
@@ -1601,7 +1636,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * Sets whether date headers should be formatted according to the ISO
-         * 8601 standard. The option will be converted to a boolean type.
+         * 8601 standard. The option will be converted to a <code>boolean</code>
+         * type.
          */
         public ActiveMQProducerBuilder formatDateHeadersToIso8601(
                 String formatDateHeadersToIso8601) {
@@ -1617,7 +1653,8 @@ public interface ActiveMQEndpointBuilder {
          * the endpoint instead. So, when using this option, the headers
          * override the values from the endpoint. The explicitQosEnabled option,
          * by contrast, will only use options set on the endpoint, and not
-         * values from the message header. The option is a boolean type.
+         * values from the message header. The option is a <code>boolean</code>
+         * type.
          */
         public ActiveMQProducerBuilder preserveMessageQos(
                 boolean preserveMessageQos) {
@@ -1634,7 +1671,7 @@ public interface ActiveMQEndpointBuilder {
          * override the values from the endpoint. The explicitQosEnabled option,
          * by contrast, will only use options set on the endpoint, and not
          * values from the message header. The option will be converted to a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder preserveMessageQos(
                 String preserveMessageQos) {
@@ -1645,7 +1682,7 @@ public interface ActiveMQEndpointBuilder {
          * Values greater than 1 specify the message priority when sending
          * (where 0 is the lowest priority and 9 is the highest). The
          * explicitQosEnabled option must also be enabled in order for this
-         * option to have any effect. The option is a int type.
+         * option to have any effect. The option is a <code>int</code> type.
          */
         public ActiveMQProducerBuilder priority(int priority) {
             this.properties.put("priority", priority);
@@ -1655,8 +1692,8 @@ public interface ActiveMQEndpointBuilder {
          * Values greater than 1 specify the message priority when sending
          * (where 0 is the lowest priority and 9 is the highest). The
          * explicitQosEnabled option must also be enabled in order for this
-         * option to have any effect. The option will be converted to a int
-         * type.
+         * option to have any effect. The option will be converted to a
+         * <code>int</code> type.
          */
         public ActiveMQProducerBuilder priority(String priority) {
             this.properties.put("priority", priority);
@@ -1665,7 +1702,8 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies the default number of concurrent consumers when doing
          * request/reply over JMS. See also the maxMessagesPerTask option to
-         * control dynamic scaling up/down of threads. The option is a int type.
+         * control dynamic scaling up/down of threads. The option is a
+         * <code>int</code> type.
          */
         public ActiveMQProducerBuilder replyToConcurrentConsumers(
                 int replyToConcurrentConsumers) {
@@ -1676,7 +1714,7 @@ public interface ActiveMQEndpointBuilder {
          * Specifies the default number of concurrent consumers when doing
          * request/reply over JMS. See also the maxMessagesPerTask option to
          * control dynamic scaling up/down of threads. The option will be
-         * converted to a int type.
+         * converted to a <code>int</code> type.
          */
         public ActiveMQProducerBuilder replyToConcurrentConsumers(
                 String replyToConcurrentConsumers) {
@@ -1686,7 +1724,8 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies the maximum number of concurrent consumers when using
          * request/reply over JMS. See also the maxMessagesPerTask option to
-         * control dynamic scaling up/down of threads. The option is a int type.
+         * control dynamic scaling up/down of threads. The option is a
+         * <code>int</code> type.
          */
         public ActiveMQProducerBuilder replyToMaxConcurrentConsumers(
                 int replyToMaxConcurrentConsumers) {
@@ -1697,7 +1736,7 @@ public interface ActiveMQEndpointBuilder {
          * Specifies the maximum number of concurrent consumers when using
          * request/reply over JMS. See also the maxMessagesPerTask option to
          * control dynamic scaling up/down of threads. The option will be
-         * converted to a int type.
+         * converted to a <code>int</code> type.
          */
         public ActiveMQProducerBuilder replyToMaxConcurrentConsumers(
                 String replyToMaxConcurrentConsumers) {
@@ -1707,7 +1746,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies the maximum number of concurrent consumers for continue
          * routing when timeout occurred when using request/reply over JMS. The
-         * option is a int type.
+         * option is a <code>int</code> type.
          */
         public ActiveMQProducerBuilder replyToOnTimeoutMaxConcurrentConsumers(
                 int replyToOnTimeoutMaxConcurrentConsumers) {
@@ -1717,7 +1756,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Specifies the maximum number of concurrent consumers for continue
          * routing when timeout occurred when using request/reply over JMS. The
-         * option will be converted to a int type.
+         * option will be converted to a <code>int</code> type.
          */
         public ActiveMQProducerBuilder replyToOnTimeoutMaxConcurrentConsumers(
                 String replyToOnTimeoutMaxConcurrentConsumers) {
@@ -1728,7 +1767,8 @@ public interface ActiveMQEndpointBuilder {
          * Provides an explicit ReplyTo destination in the JMS message, which
          * overrides the setting of replyTo. It is useful if you want to forward
          * the message to a remote Queue and receive the reply message from the
-         * ReplyTo destination. The option is a java.lang.String type.
+         * ReplyTo destination. The option is a <code>java.lang.String</code>
+         * type.
          */
         public ActiveMQProducerBuilder replyToOverride(String replyToOverride) {
             this.properties.put("replyToOverride", replyToOverride);
@@ -1744,7 +1784,8 @@ public interface ActiveMQEndpointBuilder {
          * and especially the notes about the implications if running in a
          * clustered environment, and the fact that Shared reply queues has
          * lower performance than its alternatives Temporary and Exclusive. The
-         * option is a org.apache.camel.component.jms.ReplyToType type.
+         * option is a <code>org.apache.camel.component.jms.ReplyToType</code>
+         * type.
          */
         public ActiveMQProducerBuilder replyToType(ReplyToType replyToType) {
             this.properties.put("replyToType", replyToType);
@@ -1761,7 +1802,7 @@ public interface ActiveMQEndpointBuilder {
          * clustered environment, and the fact that Shared reply queues has
          * lower performance than its alternatives Temporary and Exclusive. The
          * option will be converted to a
-         * org.apache.camel.component.jms.ReplyToType type.
+         * <code>org.apache.camel.component.jms.ReplyToType</code> type.
          */
         public ActiveMQProducerBuilder replyToType(String replyToType) {
             this.properties.put("replyToType", replyToType);
@@ -1773,7 +1814,7 @@ public interface ActiveMQEndpointBuilder {
          * the header CamelJmsRequestTimeout to override this endpoint
          * configured timeout value, and thus have per message individual
          * timeout values. See also the requestTimeoutCheckerInterval option.
-         * The option is a long type.
+         * The option is a <code>long</code> type.
          */
         public ActiveMQProducerBuilder requestTimeout(long requestTimeout) {
             this.properties.put("requestTimeout", requestTimeout);
@@ -1785,7 +1826,7 @@ public interface ActiveMQEndpointBuilder {
          * the header CamelJmsRequestTimeout to override this endpoint
          * configured timeout value, and thus have per message individual
          * timeout values. See also the requestTimeoutCheckerInterval option.
-         * The option will be converted to a long type.
+         * The option will be converted to a <code>long</code> type.
          */
         public ActiveMQProducerBuilder requestTimeout(String requestTimeout) {
             this.properties.put("requestTimeout", requestTimeout);
@@ -1793,7 +1834,7 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * When sending messages, specifies the time-to-live of the message (in
-         * milliseconds). The option is a long type.
+         * milliseconds). The option is a <code>long</code> type.
          */
         public ActiveMQProducerBuilder timeToLive(long timeToLive) {
             this.properties.put("timeToLive", timeToLive);
@@ -1801,7 +1842,8 @@ public interface ActiveMQEndpointBuilder {
         }
         /**
          * When sending messages, specifies the time-to-live of the message (in
-         * milliseconds). The option will be converted to a long type.
+         * milliseconds). The option will be converted to a <code>long</code>
+         * type.
          */
         public ActiveMQProducerBuilder timeToLive(String timeToLive) {
             this.properties.put("timeToLive", timeToLive);
@@ -1813,8 +1855,8 @@ public interface ActiveMQEndpointBuilder {
          * message systems such as WMQ do this with header names using prefix
          * JMS_IBM_MQMD_ containing values with byte array or other invalid
          * types. You can specify multiple header names separated by comma, and
-         * use as suffix for wildcard matching. The option is a java.lang.String
-         * type.
+         * use as suffix for wildcard matching. The option is a
+         * <code>java.lang.String</code> type.
          */
         public ActiveMQProducerBuilder allowAdditionalHeaders(
                 String allowAdditionalHeaders) {
@@ -1824,7 +1866,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Whether to allow sending messages with no body. If this option is
          * false and the message body is null, then an JMSException is thrown.
-         * The option is a boolean type.
+         * The option is a <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder allowNullBody(boolean allowNullBody) {
             this.properties.put("allowNullBody", allowNullBody);
@@ -1833,7 +1875,7 @@ public interface ActiveMQEndpointBuilder {
         /**
          * Whether to allow sending messages with no body. If this option is
          * false and the message body is null, then an JMSException is thrown.
-         * The option will be converted to a boolean type.
+         * The option will be converted to a <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder allowNullBody(String allowNullBody) {
             this.properties.put("allowNullBody", allowNullBody);
@@ -1845,7 +1887,8 @@ public interface ActiveMQEndpointBuilder {
          * needed in some situations, such as when a
          * replyToDestinationSelectorName is set (incidentally, Camel will set
          * the alwaysCopyMessage option to true, if a
-         * replyToDestinationSelectorName is set). The option is a boolean type.
+         * replyToDestinationSelectorName is set). The option is a
+         * <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder alwaysCopyMessage(
                 boolean alwaysCopyMessage) {
@@ -1859,7 +1902,7 @@ public interface ActiveMQEndpointBuilder {
          * replyToDestinationSelectorName is set (incidentally, Camel will set
          * the alwaysCopyMessage option to true, if a
          * replyToDestinationSelectorName is set). The option will be converted
-         * to a boolean type.
+         * to a <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder alwaysCopyMessage(
                 String alwaysCopyMessage) {
@@ -1873,7 +1916,7 @@ public interface ActiveMQEndpointBuilder {
          * using JMSCorrelationID JMS property. If used JMSCorrelationID will
          * not be used or set by Camel. The value of here named property will be
          * generated if not supplied in the header of the message under the same
-         * name. The option is a java.lang.String type.
+         * name. The option is a <code>java.lang.String</code> type.
          */
         public ActiveMQProducerBuilder correlationProperty(
                 String correlationProperty) {
@@ -1889,7 +1932,7 @@ public interface ActiveMQEndpointBuilder {
          * to archive. So you can use disableTimeToLive=true to not set a time
          * to live value on the sent message. Then the message will not expire
          * on the receiver system. See below in section About time to live for
-         * more details. The option is a boolean type.
+         * more details. The option is a <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder disableTimeToLive(
                 boolean disableTimeToLive) {
@@ -1905,7 +1948,8 @@ public interface ActiveMQEndpointBuilder {
          * to archive. So you can use disableTimeToLive=true to not set a time
          * to live value on the sent message. Then the message will not expire
          * on the receiver system. See below in section About time to live for
-         * more details. The option will be converted to a boolean type.
+         * more details. The option will be converted to a <code>boolean</code>
+         * type.
          */
         public ActiveMQProducerBuilder disableTimeToLive(
                 String disableTimeToLive) {
@@ -1916,7 +1960,8 @@ public interface ActiveMQEndpointBuilder {
          * When using mapJmsMessage=false Camel will create a new JMS message to
          * send to a new JMS destination if you touch the headers (get or set)
          * during the route. Set this option to true to force Camel to send the
-         * original JMS message that was received. The option is a boolean type.
+         * original JMS message that was received. The option is a
+         * <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder forceSendOriginalMessage(
                 boolean forceSendOriginalMessage) {
@@ -1928,7 +1973,7 @@ public interface ActiveMQEndpointBuilder {
          * send to a new JMS destination if you touch the headers (get or set)
          * during the route. Set this option to true to force Camel to send the
          * original JMS message that was received. The option will be converted
-         * to a boolean type.
+         * to a <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder forceSendOriginalMessage(
                 String forceSendOriginalMessage) {
@@ -1939,8 +1984,8 @@ public interface ActiveMQEndpointBuilder {
          * Only applicable when sending to JMS destination using InOnly (eg fire
          * and forget). Enabling this option will enrich the Camel Exchange with
          * the actual JMSMessageID that was used by the JMS client when the
-         * message was sent to the JMS destination. The option is a boolean
-         * type.
+         * message was sent to the JMS destination. The option is a
+         * <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder includeSentJMSMessageID(
                 boolean includeSentJMSMessageID) {
@@ -1952,7 +1997,7 @@ public interface ActiveMQEndpointBuilder {
          * and forget). Enabling this option will enrich the Camel Exchange with
          * the actual JMSMessageID that was used by the JMS client when the
          * message was sent to the JMS destination. The option will be converted
-         * to a boolean type.
+         * to a <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder includeSentJMSMessageID(
                 String includeSentJMSMessageID) {
@@ -1969,7 +2014,7 @@ public interface ActiveMQEndpointBuilder {
          * replyToCacheLevelName=CACHE_NONE to work. Note: If using temporary
          * queues then CACHE_NONE is not allowed, and you must use a higher
          * value such as CACHE_CONSUMER or CACHE_SESSION. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public ActiveMQProducerBuilder replyToCacheLevelName(
                 String replyToCacheLevelName) {
@@ -1980,7 +2025,7 @@ public interface ActiveMQEndpointBuilder {
          * Sets the JMS Selector using the fixed name to be used so you can
          * filter out your own replies from the others when using a shared queue
          * (that is, if you are not using a temporary reply queue). The option
-         * is a java.lang.String type.
+         * is a <code>java.lang.String</code> type.
          */
         public ActiveMQProducerBuilder replyToDestinationSelectorName(
                 String replyToDestinationSelectorName) {
@@ -1995,7 +2040,7 @@ public interface ActiveMQEndpointBuilder {
          * entire message payload to be read into memory. By enabling this
          * option the message payload is read into memory in chunks and each
          * chunk is then written to the StreamMessage until no more data. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder streamMessageTypeEnabled(
                 boolean streamMessageTypeEnabled) {
@@ -2010,7 +2055,7 @@ public interface ActiveMQEndpointBuilder {
          * entire message payload to be read into memory. By enabling this
          * option the message payload is read into memory in chunks and each
          * chunk is then written to the StreamMessage until no more data. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public ActiveMQProducerBuilder streamMessageTypeEnabled(
                 String streamMessageTypeEnabled) {
@@ -2020,7 +2065,7 @@ public interface ActiveMQEndpointBuilder {
     }
 
     public static enum JmsMessageType {
-        Bytes, Map, Object, Stream, Text;
+        Bytes, Map, Object, Stream, Text, Blob;
     }
 
     public static enum ConsumerType {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AhcEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AhcEndpointBuilder.java
index e0264c4..3b1c6f5 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AhcEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AhcEndpointBuilder.java
@@ -41,7 +41,7 @@ public interface AhcEndpointBuilder {
         }
         /**
          * The URI to use such as http://hostname:port/path. The option is a
-         * java.net.URI type.
+         * <code>java.net.URI</code> type.
          */
         public T httpUri(URI httpUri) {
             this.properties.put("httpUri", httpUri);
@@ -49,7 +49,7 @@ public interface AhcEndpointBuilder {
         }
         /**
          * The URI to use such as http://hostname:port/path. The option will be
-         * converted to a java.net.URI type.
+         * converted to a <code>java.net.URI</code> type.
          */
         public T httpUri(String httpUri) {
             this.properties.put("httpUri", httpUri);
@@ -59,7 +59,7 @@ public interface AhcEndpointBuilder {
          * If the option is true, then the Exchange.HTTP_URI header is ignored,
          * and use the endpoint's URI for request. You may also set the
          * throwExceptionOnFailure to be false to let the AhcProducer send all
-         * the fault response back. The option is a boolean type.
+         * the fault response back. The option is a <code>boolean</code> type.
          */
         public T bridgeEndpoint(boolean bridgeEndpoint) {
             this.properties.put("bridgeEndpoint", bridgeEndpoint);
@@ -69,8 +69,8 @@ public interface AhcEndpointBuilder {
          * If the option is true, then the Exchange.HTTP_URI header is ignored,
          * and use the endpoint's URI for request. You may also set the
          * throwExceptionOnFailure to be false to let the AhcProducer send all
-         * the fault response back. The option will be converted to a boolean
-         * type.
+         * the fault response back. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T bridgeEndpoint(String bridgeEndpoint) {
             this.properties.put("bridgeEndpoint", bridgeEndpoint);
@@ -78,7 +78,7 @@ public interface AhcEndpointBuilder {
         }
         /**
          * The initial in-memory buffer size used when transferring data between
-         * Camel and AHC Client. The option is a int type.
+         * Camel and AHC Client. The option is a <code>int</code> type.
          */
         public T bufferSize(int bufferSize) {
             this.properties.put("bufferSize", bufferSize);
@@ -86,7 +86,8 @@ public interface AhcEndpointBuilder {
         }
         /**
          * The initial in-memory buffer size used when transferring data between
-         * Camel and AHC Client. The option will be converted to a int type.
+         * Camel and AHC Client. The option will be converted to a
+         * <code>int</code> type.
          */
         public T bufferSize(String bufferSize) {
             this.properties.put("bufferSize", bufferSize);
@@ -95,7 +96,7 @@ public interface AhcEndpointBuilder {
         /**
          * To use a custom HeaderFilterStrategy to filter header to and from
          * Camel message. The option is a
-         * org.apache.camel.spi.HeaderFilterStrategy type.
+         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
          */
         public T headerFilterStrategy(HeaderFilterStrategy headerFilterStrategy) {
             this.properties.put("headerFilterStrategy", headerFilterStrategy);
@@ -104,7 +105,7 @@ public interface AhcEndpointBuilder {
         /**
          * To use a custom HeaderFilterStrategy to filter header to and from
          * Camel message. The option will be converted to a
-         * org.apache.camel.spi.HeaderFilterStrategy type.
+         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
          */
         public T headerFilterStrategy(String headerFilterStrategy) {
             this.properties.put("headerFilterStrategy", headerFilterStrategy);
@@ -113,8 +114,8 @@ public interface AhcEndpointBuilder {
         /**
          * Option to disable throwing the AhcOperationFailedException in case of
          * failed responses from the remote server. This allows you to get all
-         * responses regardless of the HTTP status code. The option is a boolean
-         * type.
+         * responses regardless of the HTTP status code. The option is a
+         * <code>boolean</code> type.
          */
         public T throwExceptionOnFailure(boolean throwExceptionOnFailure) {
             this.properties.put("throwExceptionOnFailure", throwExceptionOnFailure);
@@ -124,7 +125,7 @@ public interface AhcEndpointBuilder {
          * Option to disable throwing the AhcOperationFailedException in case of
          * failed responses from the remote server. This allows you to get all
          * responses regardless of the HTTP status code. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T throwExceptionOnFailure(String throwExceptionOnFailure) {
             this.properties.put("throwExceptionOnFailure", throwExceptionOnFailure);
@@ -140,7 +141,7 @@ public interface AhcEndpointBuilder {
          * serialized. This is by default turned off. If you enable this then be
          * aware that Java will deserialize the incoming data from the request
          * to Java and that can be a potential security risk. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T transferException(boolean transferException) {
             this.properties.put("transferException", transferException);
@@ -156,7 +157,7 @@ public interface AhcEndpointBuilder {
          * serialized. This is by default turned off. If you enable this then be
          * aware that Java will deserialize the incoming data from the request
          * to Java and that can be a potential security risk. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T transferException(String transferException) {
             this.properties.put("transferException", transferException);
@@ -165,7 +166,7 @@ public interface AhcEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -174,7 +175,7 @@ public interface AhcEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -183,7 +184,7 @@ public interface AhcEndpointBuilder {
         /**
          * To use a custom AhcBinding which allows to control how to bind
          * between AHC and Camel. The option is a
-         * org.apache.camel.component.ahc.AhcBinding type.
+         * <code>org.apache.camel.component.ahc.AhcBinding</code> type.
          */
         public T binding(Object binding) {
             this.properties.put("binding", binding);
@@ -192,7 +193,7 @@ public interface AhcEndpointBuilder {
         /**
          * To use a custom AhcBinding which allows to control how to bind
          * between AHC and Camel. The option will be converted to a
-         * org.apache.camel.component.ahc.AhcBinding type.
+         * <code>org.apache.camel.component.ahc.AhcBinding</code> type.
          */
         public T binding(String binding) {
             this.properties.put("binding", binding);
@@ -201,7 +202,7 @@ public interface AhcEndpointBuilder {
         /**
          * To configure the AsyncHttpClient to use a custom
          * com.ning.http.client.AsyncHttpClientConfig instance. The option is a
-         * org.asynchttpclient.AsyncHttpClientConfig type.
+         * <code>org.asynchttpclient.AsyncHttpClientConfig</code> type.
          */
         public T clientConfig(Object clientConfig) {
             this.properties.put("clientConfig", clientConfig);
@@ -210,7 +211,8 @@ public interface AhcEndpointBuilder {
         /**
          * To configure the AsyncHttpClient to use a custom
          * com.ning.http.client.AsyncHttpClientConfig instance. The option will
-         * be converted to a org.asynchttpclient.AsyncHttpClientConfig type.
+         * be converted to a
+         * <code>org.asynchttpclient.AsyncHttpClientConfig</code> type.
          */
         public T clientConfig(String clientConfig) {
             this.properties.put("clientConfig", clientConfig);
@@ -218,8 +220,8 @@ public interface AhcEndpointBuilder {
         }
         /**
          * To configure the AsyncHttpClientConfig using the key/values from the
-         * Map. The option is a java.util.Map<java.lang.String,java.lang.Object>
-         * type.
+         * Map. The option is a <code>java.util.Map<java.lang.String,
+         * java.lang.Object></code> type.
          */
         public T clientConfigOptions(Map<String, Object> clientConfigOptions) {
             this.properties.put("clientConfigOptions", clientConfigOptions);
@@ -228,7 +230,7 @@ public interface AhcEndpointBuilder {
         /**
          * To configure the AsyncHttpClientConfig using the key/values from the
          * Map. The option will be converted to a
-         * java.util.Map<java.lang.String,java.lang.Object> type.
+         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
          */
         public T clientConfigOptions(String clientConfigOptions) {
             this.properties.put("clientConfigOptions", clientConfigOptions);
@@ -237,7 +239,7 @@ public interface AhcEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -246,7 +248,7 @@ public interface AhcEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -254,8 +256,8 @@ public interface AhcEndpointBuilder {
         }
         /**
          * To configure the AsyncHttpClientConfig Realm using the key/values
-         * from the Map. The option is a
-         * java.util.Map<java.lang.String,java.lang.Object> type.
+         * from the Map. The option is a <code>java.util.Map<java.lang.String,
+         * java.lang.Object></code> type.
          */
         public T clientConfigRealmOptions(
                 Map<String, Object> clientConfigRealmOptions) {
@@ -265,7 +267,7 @@ public interface AhcEndpointBuilder {
         /**
          * To configure the AsyncHttpClientConfig Realm using the key/values
          * from the Map. The option will be converted to a
-         * java.util.Map<java.lang.String,java.lang.Object> type.
+         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
          */
         public T clientConfigRealmOptions(String clientConfigRealmOptions) {
             this.properties.put("clientConfigRealmOptions", clientConfigRealmOptions);
@@ -278,7 +280,8 @@ public interface AhcEndpointBuilder {
          * Configuration Utility. Note that configuring this option will
          * override any SSL/TLS configuration options provided through the
          * clientConfig option at the endpoint or component level. The option is
-         * a org.apache.camel.support.jsse.SSLContextParameters type.
+         * a <code>org.apache.camel.support.jsse.SSLContextParameters</code>
+         * type.
          */
         public T sslContextParameters(Object sslContextParameters) {
             this.properties.put("sslContextParameters", sslContextParameters);
@@ -292,7 +295,7 @@ public interface AhcEndpointBuilder {
          * override any SSL/TLS configuration options provided through the
          * clientConfig option at the endpoint or component level. The option
          * will be converted to a
-         * org.apache.camel.support.jsse.SSLContextParameters type.
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
          */
         public T sslContextParameters(String sslContextParameters) {
             this.properties.put("sslContextParameters", sslContextParameters);
@@ -310,8 +313,8 @@ public interface AhcEndpointBuilder {
         }
         /**
          * Define if the Connection Close header has to be added to HTTP
-         * Request. This parameter is false by default. The option is a boolean
-         * type.
+         * Request. This parameter is false by default. The option is a
+         * <code>boolean</code> type.
          */
         public AhcProducerBuilder connectionClose(boolean connectionClose) {
             this.properties.put("connectionClose", connectionClose);
@@ -320,7 +323,7 @@ public interface AhcEndpointBuilder {
         /**
          * Define if the Connection Close header has to be added to HTTP
          * Request. This parameter is false by default. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public AhcProducerBuilder connectionClose(String connectionClose) {
             this.properties.put("connectionClose", connectionClose);
@@ -328,7 +331,8 @@ public interface AhcEndpointBuilder {
         }
         /**
          * Configure a cookie handler to maintain a HTTP session. The option is
-         * a org.apache.camel.http.common.cookie.CookieHandler type.
+         * a <code>org.apache.camel.http.common.cookie.CookieHandler</code>
+         * type.
          */
         public AhcProducerBuilder cookieHandler(Object cookieHandler) {
             this.properties.put("cookieHandler", cookieHandler);
@@ -337,7 +341,7 @@ public interface AhcEndpointBuilder {
         /**
          * Configure a cookie handler to maintain a HTTP session. The option
          * will be converted to a
-         * org.apache.camel.http.common.cookie.CookieHandler type.
+         * <code>org.apache.camel.http.common.cookie.CookieHandler</code> type.
          */
         public AhcProducerBuilder cookieHandler(String cookieHandler) {
             this.properties.put("cookieHandler", cookieHandler);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ApnsEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ApnsEndpointBuilder.java
index c3ce8de..aa3612c 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ApnsEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ApnsEndpointBuilder.java
@@ -45,7 +45,8 @@ public interface ApnsEndpointBuilder {
             super("apns", path);
         }
         /**
-         * Name of the endpoint. The option is a java.lang.String type.
+         * Name of the endpoint. The option is a <code>java.lang.String</code>
+         * type.
          */
         public T name(String name) {
             this.properties.put("name", name);
@@ -54,7 +55,7 @@ public interface ApnsEndpointBuilder {
         /**
          * Configure this property in case you want to statically declare tokens
          * related to devices you want to notify. Tokens are separated by comma.
-         * The option is a java.lang.String type.
+         * The option is a <code>java.lang.String</code> type.
          */
         public T tokens(String tokens) {
             this.properties.put("tokens", tokens);
@@ -63,7 +64,7 @@ public interface ApnsEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -72,7 +73,7 @@ public interface ApnsEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -81,7 +82,7 @@ public interface ApnsEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -90,7 +91,7 @@ public interface ApnsEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -113,7 +114,7 @@ public interface ApnsEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public ApnsConsumerBuilder bridgeErrorHandler(boolean bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -126,7 +127,7 @@ public interface ApnsEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public ApnsConsumerBuilder bridgeErrorHandler(String bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -135,7 +136,7 @@ public interface ApnsEndpointBuilder {
         /**
          * If the polling consumer did not poll any files, you can enable this
          * option to send an empty message (no body) instead. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public ApnsConsumerBuilder sendEmptyMessageWhenIdle(
                 boolean sendEmptyMessageWhenIdle) {
@@ -145,7 +146,7 @@ public interface ApnsEndpointBuilder {
         /**
          * If the polling consumer did not poll any files, you can enable this
          * option to send an empty message (no body) instead. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public ApnsConsumerBuilder sendEmptyMessageWhenIdle(
                 String sendEmptyMessageWhenIdle) {
@@ -157,7 +158,7 @@ public interface ApnsEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public ApnsConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -169,7 +170,8 @@ public interface ApnsEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public ApnsConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -177,7 +179,7 @@ public interface ApnsEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public ApnsConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -186,7 +188,8 @@ public interface ApnsEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public ApnsConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
@@ -197,7 +200,7 @@ public interface ApnsEndpointBuilder {
          * you to provide your custom implementation to control error handling
          * usually occurred during the poll operation before an Exchange have
          * been created and being routed in Camel. The option is a
-         * org.apache.camel.spi.PollingConsumerPollStrategy type.
+         * <code>org.apache.camel.spi.PollingConsumerPollStrategy</code> type.
          */
         public ApnsConsumerBuilder pollStrategy(
                 PollingConsumerPollStrategy pollStrategy) {
@@ -209,7 +212,8 @@ public interface ApnsEndpointBuilder {
          * you to provide your custom implementation to control error handling
          * usually occurred during the poll operation before an Exchange have
          * been created and being routed in Camel. The option will be converted
-         * to a org.apache.camel.spi.PollingConsumerPollStrategy type.
+         * to a <code>org.apache.camel.spi.PollingConsumerPollStrategy</code>
+         * type.
          */
         public ApnsConsumerBuilder pollStrategy(String pollStrategy) {
             this.properties.put("pollStrategy", pollStrategy);
@@ -218,7 +222,7 @@ public interface ApnsEndpointBuilder {
         /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in. The option
-         * is a int type.
+         * is a <code>int</code> type.
          */
         public ApnsConsumerBuilder backoffErrorThreshold(
                 int backoffErrorThreshold) {
@@ -228,7 +232,7 @@ public interface ApnsEndpointBuilder {
         /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in. The option
-         * will be converted to a int type.
+         * will be converted to a <code>int</code> type.
          */
         public ApnsConsumerBuilder backoffErrorThreshold(
                 String backoffErrorThreshold) {
@@ -237,7 +241,8 @@ public interface ApnsEndpointBuilder {
         }
         /**
          * The number of subsequent idle polls that should happen before the
-         * backoffMultipler should kick-in. The option is a int type.
+         * backoffMultipler should kick-in. The option is a <code>int</code>
+         * type.
          */
         public ApnsConsumerBuilder backoffIdleThreshold(int backoffIdleThreshold) {
             this.properties.put("backoffIdleThreshold", backoffIdleThreshold);
@@ -246,7 +251,7 @@ public interface ApnsEndpointBuilder {
         /**
          * The number of subsequent idle polls that should happen before the
          * backoffMultipler should kick-in. The option will be converted to a
-         * int type.
+         * <code>int</code> type.
          */
         public ApnsConsumerBuilder backoffIdleThreshold(
                 String backoffIdleThreshold) {
@@ -259,7 +264,7 @@ public interface ApnsEndpointBuilder {
          * the number of polls that will be skipped before the next actual
          * attempt is happening again. When this option is in use then
          * backoffIdleThreshold and/or backoffErrorThreshold must also be
-         * configured. The option is a int type.
+         * configured. The option is a <code>int</code> type.
          */
         public ApnsConsumerBuilder backoffMultiplier(int backoffMultiplier) {
             this.properties.put("backoffMultiplier", backoffMultiplier);
@@ -271,7 +276,7 @@ public interface ApnsEndpointBuilder {
          * the number of polls that will be skipped before the next actual
          * attempt is happening again. When this option is in use then
          * backoffIdleThreshold and/or backoffErrorThreshold must also be
-         * configured. The option will be converted to a int type.
+         * configured. The option will be converted to a <code>int</code> type.
          */
         public ApnsConsumerBuilder backoffMultiplier(String backoffMultiplier) {
             this.properties.put("backoffMultiplier", backoffMultiplier);
@@ -280,7 +285,7 @@ public interface ApnsEndpointBuilder {
         /**
          * Milliseconds before the next poll. You can also specify time values
          * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option is a long type.
+         * seconds), and 1h (1 hour). The option is a <code>long</code> type.
          */
         public ApnsConsumerBuilder delay(long delay) {
             this.properties.put("delay", delay);
@@ -289,8 +294,8 @@ public interface ApnsEndpointBuilder {
         /**
          * Milliseconds before the next poll. You can also specify time values
          * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option will be converted to a long
-         * type.
+         * seconds), and 1h (1 hour). The option will be converted to a
+         * <code>long</code> type.
          */
         public ApnsConsumerBuilder delay(String delay) {
             this.properties.put("delay", delay);
@@ -299,7 +304,7 @@ public interface ApnsEndpointBuilder {
         /**
          * If greedy is enabled, then the ScheduledPollConsumer will run
          * immediately again, if the previous run polled 1 or more messages. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public ApnsConsumerBuilder greedy(boolean greedy) {
             this.properties.put("greedy", greedy);
@@ -308,7 +313,7 @@ public interface ApnsEndpointBuilder {
         /**
          * If greedy is enabled, then the ScheduledPollConsumer will run
          * immediately again, if the previous run polled 1 or more messages. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public ApnsConsumerBuilder greedy(String greedy) {
             this.properties.put("greedy", greedy);
@@ -317,7 +322,7 @@ public interface ApnsEndpointBuilder {
         /**
          * Milliseconds before the first poll starts. You can also specify time
          * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option is a long type.
+         * seconds), and 1h (1 hour). The option is a <code>long</code> type.
          */
         public ApnsConsumerBuilder initialDelay(long initialDelay) {
             this.properties.put("initialDelay", initialDelay);
@@ -326,8 +331,8 @@ public interface ApnsEndpointBuilder {
         /**
          * Milliseconds before the first poll starts. You can also specify time
          * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option will be converted to a long
-         * type.
+         * seconds), and 1h (1 hour). The option will be converted to a
+         * <code>long</code> type.
          */
         public ApnsConsumerBuilder initialDelay(String initialDelay) {
             this.properties.put("initialDelay", initialDelay);
@@ -336,7 +341,7 @@ public interface ApnsEndpointBuilder {
         /**
          * The consumer logs a start/complete log line when it polls. This
          * option allows you to configure the logging level for that. The option
-         * is a org.apache.camel.LoggingLevel type.
+         * is a <code>org.apache.camel.LoggingLevel</code> type.
          */
         public ApnsConsumerBuilder runLoggingLevel(LoggingLevel runLoggingLevel) {
             this.properties.put("runLoggingLevel", runLoggingLevel);
@@ -345,7 +350,8 @@ public interface ApnsEndpointBuilder {
         /**
          * The consumer logs a start/complete log line when it polls. This
          * option allows you to configure the logging level for that. The option
-         * will be converted to a org.apache.camel.LoggingLevel type.
+         * will be converted to a <code>org.apache.camel.LoggingLevel</code>
+         * type.
          */
         public ApnsConsumerBuilder runLoggingLevel(String runLoggingLevel) {
             this.properties.put("runLoggingLevel", runLoggingLevel);
@@ -354,8 +360,8 @@ public interface ApnsEndpointBuilder {
         /**
          * Allows for configuring a custom/shared thread pool to use for the
          * consumer. By default each consumer has its own single threaded thread
-         * pool. The option is a java.util.concurrent.ScheduledExecutorService
-         * type.
+         * pool. The option is a
+         * <code>java.util.concurrent.ScheduledExecutorService</code> type.
          */
         public ApnsConsumerBuilder scheduledExecutorService(
                 ScheduledExecutorService scheduledExecutorService) {
@@ -366,7 +372,7 @@ public interface ApnsEndpointBuilder {
          * Allows for configuring a custom/shared thread pool to use for the
          * consumer. By default each consumer has its own single threaded thread
          * pool. The option will be converted to a
-         * java.util.concurrent.ScheduledExecutorService type.
+         * <code>java.util.concurrent.ScheduledExecutorService</code> type.
          */
         public ApnsConsumerBuilder scheduledExecutorService(
                 String scheduledExecutorService) {
@@ -376,7 +382,8 @@ public interface ApnsEndpointBuilder {
         /**
          * To use a cron scheduler from either camel-spring or camel-quartz2
          * component. The option is a
-         * org.apache.camel.spi.ScheduledPollConsumerScheduler type.
+         * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code>
+         * type.
          */
         public ApnsConsumerBuilder scheduler(
                 ScheduledPollConsumerScheduler scheduler) {
@@ -386,7 +393,8 @@ public interface ApnsEndpointBuilder {
         /**
          * To use a cron scheduler from either camel-spring or camel-quartz2
          * component. The option will be converted to a
-         * org.apache.camel.spi.ScheduledPollConsumerScheduler type.
+         * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code>
+         * type.
          */
         public ApnsConsumerBuilder scheduler(String scheduler) {
             this.properties.put("scheduler", scheduler);
@@ -395,7 +403,7 @@ public interface ApnsEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * java.util.Map<java.lang.String,java.lang.Object> type.
+         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
          */
         public ApnsConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -405,7 +413,8 @@ public interface ApnsEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a java.util.Map<java.lang.String,java.lang.Object> type.
+         * converted to a <code>java.util.Map<java.lang.String,
+         * java.lang.Object></code> type.
          */
         public ApnsConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
@@ -413,8 +422,8 @@ public interface ApnsEndpointBuilder {
             return (ApnsConsumerBuilder) this;
         }
         /**
-         * Whether the scheduler should be auto started. The option is a boolean
-         * type.
+         * Whether the scheduler should be auto started. The option is a
+         * <code>boolean</code> type.
          */
         public ApnsConsumerBuilder startScheduler(boolean startScheduler) {
             this.properties.put("startScheduler", startScheduler);
@@ -422,7 +431,7 @@ public interface ApnsEndpointBuilder {
         }
         /**
          * Whether the scheduler should be auto started. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public ApnsConsumerBuilder startScheduler(String startScheduler) {
             this.properties.put("startScheduler", startScheduler);
@@ -430,7 +439,7 @@ public interface ApnsEndpointBuilder {
         }
         /**
          * Time unit for initialDelay and delay options. The option is a
-         * java.util.concurrent.TimeUnit type.
+         * <code>java.util.concurrent.TimeUnit</code> type.
          */
         public ApnsConsumerBuilder timeUnit(TimeUnit timeUnit) {
             this.properties.put("timeUnit", timeUnit);
@@ -438,7 +447,7 @@ public interface ApnsEndpointBuilder {
         }
         /**
          * Time unit for initialDelay and delay options. The option will be
-         * converted to a java.util.concurrent.TimeUnit type.
+         * converted to a <code>java.util.concurrent.TimeUnit</code> type.
          */
         public ApnsConsumerBuilder timeUnit(String timeUnit) {
             this.properties.put("timeUnit", timeUnit);
@@ -446,8 +455,8 @@ public interface ApnsEndpointBuilder {
         }
         /**
          * Controls if fixed delay or fixed rate is used. See
-         * ScheduledExecutorService in JDK for details. The option is a boolean
-         * type.
+         * ScheduledExecutorService in JDK for details. The option is a
+         * <code>boolean</code> type.
          */
         public ApnsConsumerBuilder useFixedDelay(boolean useFixedDelay) {
             this.properties.put("useFixedDelay", useFixedDelay);
@@ -456,7 +465,7 @@ public interface ApnsEndpointBuilder {
         /**
          * Controls if fixed delay or fixed rate is used. See
          * ScheduledExecutorService in JDK for details. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public ApnsConsumerBuilder useFixedDelay(String useFixedDelay) {
             this.properties.put("useFixedDelay", useFixedDelay);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AsteriskEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AsteriskEndpointBuilder.java
index 900e48d..1eb276d 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AsteriskEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AsteriskEndpointBuilder.java
@@ -39,29 +39,29 @@ public interface AsteriskEndpointBuilder {
             super("asterisk", path);
         }
         /**
-         * Logical name. The option is a java.lang.String type.
+         * Logical name. The option is a <code>java.lang.String</code> type.
          */
         public T name(String name) {
             this.properties.put("name", name);
             return (T) this;
         }
         /**
-         * The hostname of the asterisk server. The option is a java.lang.String
-         * type.
+         * The hostname of the asterisk server. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T hostname(String hostname) {
             this.properties.put("hostname", hostname);
             return (T) this;
         }
         /**
-         * Login password. The option is a java.lang.String type.
+         * Login password. The option is a <code>java.lang.String</code> type.
          */
         public T password(String password) {
             this.properties.put("password", password);
             return (T) this;
         }
         /**
-         * Login username. The option is a java.lang.String type.
+         * Login username. The option is a <code>java.lang.String</code> type.
          */
         public T username(String username) {
             this.properties.put("username", username);
@@ -70,7 +70,7 @@ public interface AsteriskEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -79,7 +79,7 @@ public interface AsteriskEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -88,7 +88,7 @@ public interface AsteriskEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -97,7 +97,7 @@ public interface AsteriskEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -120,7 +120,7 @@ public interface AsteriskEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AsteriskConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -134,7 +134,7 @@ public interface AsteriskEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AsteriskConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -146,7 +146,7 @@ public interface AsteriskEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AsteriskConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -158,7 +158,8 @@ public interface AsteriskEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AsteriskConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -166,7 +167,7 @@ public interface AsteriskEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AsteriskConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -175,7 +176,8 @@ public interface AsteriskEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AsteriskConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
@@ -194,7 +196,7 @@ public interface AsteriskEndpointBuilder {
         /**
          * What action to perform such as getting queue status, sip peers or
          * extension state. The option is a
-         * org.apache.camel.component.asterisk.AsteriskAction type.
+         * <code>org.apache.camel.component.asterisk.AsteriskAction</code> type.
          */
         public AsteriskProducerBuilder action(AsteriskAction action) {
             this.properties.put("action", action);
@@ -203,7 +205,7 @@ public interface AsteriskEndpointBuilder {
         /**
          * What action to perform such as getting queue status, sip peers or
          * extension state. The option will be converted to a
-         * org.apache.camel.component.asterisk.AsteriskAction type.
+         * <code>org.apache.camel.component.asterisk.AsteriskAction</code> type.
          */
         public AsteriskProducerBuilder action(String action) {
             this.properties.put("action", action);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtmosEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtmosEndpointBuilder.java
index 5a887eb..03938f0 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtmosEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtmosEndpointBuilder.java
@@ -39,7 +39,7 @@ public interface AtmosEndpointBuilder {
             super("atmos", path);
         }
         /**
-         * Atmos name. The option is a java.lang.String type.
+         * Atmos name. The option is a <code>java.lang.String</code> type.
          */
         public T name(String name) {
             this.properties.put("name", name);
@@ -47,7 +47,8 @@ public interface AtmosEndpointBuilder {
         }
         /**
          * Operation to perform. The option is a
-         * org.apache.camel.component.atmos.util.AtmosOperation type.
+         * <code>org.apache.camel.component.atmos.util.AtmosOperation</code>
+         * type.
          */
         public T operation(AtmosOperation operation) {
             this.properties.put("operation", operation);
@@ -55,71 +56,79 @@ public interface AtmosEndpointBuilder {
         }
         /**
          * Operation to perform. The option will be converted to a
-         * org.apache.camel.component.atmos.util.AtmosOperation type.
+         * <code>org.apache.camel.component.atmos.util.AtmosOperation</code>
+         * type.
          */
         public T operation(String operation) {
             this.properties.put("operation", operation);
             return (T) this;
         }
         /**
-         * Atmos SSL validation. The option is a boolean type.
+         * Atmos SSL validation. The option is a <code>boolean</code> type.
          */
         public T enableSslValidation(boolean enableSslValidation) {
             this.properties.put("enableSslValidation", enableSslValidation);
             return (T) this;
         }
         /**
-         * Atmos SSL validation. The option will be converted to a boolean type.
+         * Atmos SSL validation. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T enableSslValidation(String enableSslValidation) {
             this.properties.put("enableSslValidation", enableSslValidation);
             return (T) this;
         }
         /**
-         * Atmos client fullTokenId. The option is a java.lang.String type.
+         * Atmos client fullTokenId. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T fullTokenId(String fullTokenId) {
             this.properties.put("fullTokenId", fullTokenId);
             return (T) this;
         }
         /**
-         * Local path to put files. The option is a java.lang.String type.
+         * Local path to put files. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T localPath(String localPath) {
             this.properties.put("localPath", localPath);
             return (T) this;
         }
         /**
-         * New path on Atmos when moving files. The option is a java.lang.String
-         * type.
+         * New path on Atmos when moving files. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T newRemotePath(String newRemotePath) {
             this.properties.put("newRemotePath", newRemotePath);
             return (T) this;
         }
         /**
-         * Search query on Atmos. The option is a java.lang.String type.
+         * Search query on Atmos. The option is a <code>java.lang.String</code>
+         * type.
          */
         public T query(String query) {
             this.properties.put("query", query);
             return (T) this;
         }
         /**
-         * Where to put files on Atmos. The option is a java.lang.String type.
+         * Where to put files on Atmos. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T remotePath(String remotePath) {
             this.properties.put("remotePath", remotePath);
             return (T) this;
         }
         /**
-         * Atmos shared secret. The option is a java.lang.String type.
+         * Atmos shared secret. The option is a <code>java.lang.String</code>
+         * type.
          */
         public T secretKey(String secretKey) {
             this.properties.put("secretKey", secretKey);
             return (T) this;
         }
         /**
-         * Atomos server uri. The option is a java.lang.String type.
+         * Atomos server uri. The option is a <code>java.lang.String</code>
+         * type.
          */
         public T uri(String uri) {
             this.properties.put("uri", uri);
@@ -128,7 +137,7 @@ public interface AtmosEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -137,7 +146,7 @@ public interface AtmosEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -146,7 +155,7 @@ public interface AtmosEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -155,7 +164,7 @@ public interface AtmosEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -178,7 +187,7 @@ public interface AtmosEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AtmosConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -192,7 +201,7 @@ public interface AtmosEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AtmosConsumerBuilder bridgeErrorHandler(String bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -203,7 +212,7 @@ public interface AtmosEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AtmosConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -215,7 +224,8 @@ public interface AtmosEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AtmosConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -223,7 +233,7 @@ public interface AtmosEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtmosConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -232,7 +242,8 @@ public interface AtmosEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtmosConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtmosphereWebsocketEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtmosphereWebsocketEndpointBuilder.java
index 0905667..39e2334 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtmosphereWebsocketEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtmosphereWebsocketEndpointBuilder.java
@@ -40,7 +40,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
             super("atmosphere-websocket", path);
         }
         /**
-         * Name of websocket endpoint. The option is a java.lang.String type.
+         * Name of websocket endpoint. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T servicePath(String servicePath) {
             this.properties.put("servicePath", servicePath);
@@ -48,7 +49,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         }
         /**
          * Whether to send to all (broadcast) or send to a single receiver. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public T sendToAll(boolean sendToAll) {
             this.properties.put("sendToAll", sendToAll);
@@ -56,7 +57,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         }
         /**
          * Whether to send to all (broadcast) or send to a single receiver. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public T sendToAll(String sendToAll) {
             this.properties.put("sendToAll", sendToAll);
@@ -64,7 +65,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         }
         /**
          * To enable streaming to send data as multiple text fragments. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public T useStreaming(boolean useStreaming) {
             this.properties.put("useStreaming", useStreaming);
@@ -72,7 +73,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         }
         /**
          * To enable streaming to send data as multiple text fragments. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public T useStreaming(String useStreaming) {
             this.properties.put("useStreaming", useStreaming);
@@ -94,8 +95,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * multiple times. The http/http4 producer will by default cache the
          * response body stream. If setting this option to true, then the
          * producers will not cache the response body stream but use the
-         * response stream as-is as the message body. The option is a boolean
-         * type.
+         * response stream as-is as the message body. The option is a
+         * <code>boolean</code> type.
          */
         public T disableStreamCache(boolean disableStreamCache) {
             this.properties.put("disableStreamCache", disableStreamCache);
@@ -118,7 +119,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * response body stream. If setting this option to true, then the
          * producers will not cache the response body stream but use the
          * response stream as-is as the message body. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T disableStreamCache(String disableStreamCache) {
             this.properties.put("disableStreamCache", disableStreamCache);
@@ -127,7 +128,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * To use a custom HeaderFilterStrategy to filter header to and from
          * Camel message. The option is a
-         * org.apache.camel.spi.HeaderFilterStrategy type.
+         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
          */
         public T headerFilterStrategy(HeaderFilterStrategy headerFilterStrategy) {
             this.properties.put("headerFilterStrategy", headerFilterStrategy);
@@ -136,7 +137,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * To use a custom HeaderFilterStrategy to filter header to and from
          * Camel message. The option will be converted to a
-         * org.apache.camel.spi.HeaderFilterStrategy type.
+         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
          */
         public T headerFilterStrategy(String headerFilterStrategy) {
             this.properties.put("headerFilterStrategy", headerFilterStrategy);
@@ -145,7 +146,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * To use a custom HttpBinding to control the mapping between Camel
          * message and HttpClient. The option is a
-         * org.apache.camel.http.common.HttpBinding type.
+         * <code>org.apache.camel.http.common.HttpBinding</code> type.
          */
         public T httpBinding(Object httpBinding) {
             this.properties.put("httpBinding", httpBinding);
@@ -154,7 +155,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * To use a custom HttpBinding to control the mapping between Camel
          * message and HttpClient. The option will be converted to a
-         * org.apache.camel.http.common.HttpBinding type.
+         * <code>org.apache.camel.http.common.HttpBinding</code> type.
          */
         public T httpBinding(String httpBinding) {
             this.properties.put("httpBinding", httpBinding);
@@ -163,7 +164,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * If this option is false the Servlet will disable the HTTP streaming
          * and set the content-length header on the response. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T chunked(boolean chunked) {
             this.properties.put("chunked", chunked);
@@ -172,7 +173,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * If this option is false the Servlet will disable the HTTP streaming
          * and set the content-length header on the response. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T chunked(String chunked) {
             this.properties.put("chunked", chunked);
@@ -187,7 +188,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * required to be serialized. This is by default turned off. If you
          * enable this then be aware that Java will deserialize the incoming
          * data from the request to Java and that can be a potential security
-         * risk. The option is a boolean type.
+         * risk. The option is a <code>boolean</code> type.
          */
         public T transferException(boolean transferException) {
             this.properties.put("transferException", transferException);
@@ -202,7 +203,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * required to be serialized. This is by default turned off. If you
          * enable this then be aware that Java will deserialize the incoming
          * data from the request to Java and that can be a potential security
-         * risk. The option will be converted to a boolean type.
+         * risk. The option will be converted to a <code>boolean</code> type.
          */
         public T transferException(String transferException) {
             this.properties.put("transferException", transferException);
@@ -211,7 +212,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -220,7 +221,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -229,7 +230,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * If this option is true then IN exchange Body of the exchange will be
          * mapped to HTTP body. Setting this to false will avoid the HTTP
-         * mapping. The option is a boolean type.
+         * mapping. The option is a <code>boolean</code> type.
          */
         public T mapHttpMessageBody(boolean mapHttpMessageBody) {
             this.properties.put("mapHttpMessageBody", mapHttpMessageBody);
@@ -238,7 +239,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * If this option is true then IN exchange Body of the exchange will be
          * mapped to HTTP body. Setting this to false will avoid the HTTP
-         * mapping. The option will be converted to a boolean type.
+         * mapping. The option will be converted to a <code>boolean</code> type.
          */
         public T mapHttpMessageBody(String mapHttpMessageBody) {
             this.properties.put("mapHttpMessageBody", mapHttpMessageBody);
@@ -247,7 +248,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * If this option is true then IN exchange Form Encoded body of the
          * exchange will be mapped to HTTP. Setting this to false will avoid the
-         * HTTP Form Encoded body mapping. The option is a boolean type.
+         * HTTP Form Encoded body mapping. The option is a <code>boolean</code>
+         * type.
          */
         public T mapHttpMessageFormUrlEncodedBody(
                 boolean mapHttpMessageFormUrlEncodedBody) {
@@ -258,7 +260,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * If this option is true then IN exchange Form Encoded body of the
          * exchange will be mapped to HTTP. Setting this to false will avoid the
          * HTTP Form Encoded body mapping. The option will be converted to a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T mapHttpMessageFormUrlEncodedBody(
                 String mapHttpMessageFormUrlEncodedBody) {
@@ -268,7 +270,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * If this option is true then IN exchange Headers of the exchange will
          * be mapped to HTTP headers. Setting this to false will avoid the HTTP
-         * Headers mapping. The option is a boolean type.
+         * Headers mapping. The option is a <code>boolean</code> type.
          */
         public T mapHttpMessageHeaders(boolean mapHttpMessageHeaders) {
             this.properties.put("mapHttpMessageHeaders", mapHttpMessageHeaders);
@@ -277,7 +279,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * If this option is true then IN exchange Headers of the exchange will
          * be mapped to HTTP headers. Setting this to false will avoid the HTTP
-         * Headers mapping. The option will be converted to a boolean type.
+         * Headers mapping. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T mapHttpMessageHeaders(String mapHttpMessageHeaders) {
             this.properties.put("mapHttpMessageHeaders", mapHttpMessageHeaders);
@@ -286,7 +289,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -295,7 +298,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -312,8 +315,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
             super(path);
         }
         /**
-         * Configure the consumer to work in async mode. The option is a boolean
-         * type.
+         * Configure the consumer to work in async mode. The option is a
+         * <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder async(boolean async) {
             this.properties.put("async", async);
@@ -321,7 +324,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         }
         /**
          * Configure the consumer to work in async mode. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder async(String async) {
             this.properties.put("async", async);
@@ -334,7 +337,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -348,7 +351,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -358,7 +361,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * Used to only allow consuming if the HttpMethod matches, such as
          * GET/POST/PUT etc. Multiple methods can be specified separated by
-         * comma. The option is a java.lang.String type.
+         * comma. The option is a <code>java.lang.String</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder httpMethodRestrict(
                 String httpMethodRestrict) {
@@ -368,7 +371,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * Whether or not the consumer should try to find a target consumer by
          * matching the URI prefix if no exact match is found. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder matchOnUriPrefix(
                 boolean matchOnUriPrefix) {
@@ -378,7 +381,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * Whether or not the consumer should try to find a target consumer by
          * matching the URI prefix if no exact match is found. The option will
-         * be converted to a boolean type.
+         * be converted to a <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder matchOnUriPrefix(
                 String matchOnUriPrefix) {
@@ -387,7 +390,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         }
         /**
          * To use a custom buffer size on the javax.servlet.ServletResponse. The
-         * option is a java.lang.Integer type.
+         * option is a <code>java.lang.Integer</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder responseBufferSize(
                 Integer responseBufferSize) {
@@ -396,7 +399,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         }
         /**
          * To use a custom buffer size on the javax.servlet.ServletResponse. The
-         * option will be converted to a java.lang.Integer type.
+         * option will be converted to a <code>java.lang.Integer</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder responseBufferSize(
                 String responseBufferSize) {
@@ -404,7 +407,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
             return (AtmosphereWebsocketConsumerBuilder) this;
         }
         /**
-         * Name of the servlet to use. The option is a java.lang.String type.
+         * Name of the servlet to use. The option is a
+         * <code>java.lang.String</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder servletName(String servletName) {
             this.properties.put("servletName", servletName);
@@ -416,7 +420,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * disableStreamCache=false cannot work together. Remove
          * disableStreamCache to use AttachmentMultipartBinding. This is turn
          * off by default as this may require servlet specific configuration to
-         * enable this when using Servlet's. The option is a boolean type.
+         * enable this when using Servlet's. The option is a
+         * <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder attachmentMultipartBinding(
                 boolean attachmentMultipartBinding) {
@@ -430,7 +435,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * disableStreamCache to use AttachmentMultipartBinding. This is turn
          * off by default as this may require servlet specific configuration to
          * enable this when using Servlet's. The option will be converted to a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder attachmentMultipartBinding(
                 String attachmentMultipartBinding) {
@@ -440,8 +445,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * Whether to eager check whether the HTTP requests has content if the
          * content-length header is 0 or not present. This can be turned on in
-         * case HTTP clients do not send streamed data. The option is a boolean
-         * type.
+         * case HTTP clients do not send streamed data. The option is a
+         * <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder eagerCheckContentAvailable(
                 boolean eagerCheckContentAvailable) {
@@ -452,7 +457,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * Whether to eager check whether the HTTP requests has content if the
          * content-length header is 0 or not present. This can be turned on in
          * case HTTP clients do not send streamed data. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder eagerCheckContentAvailable(
                 String eagerCheckContentAvailable) {
@@ -464,7 +469,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -476,7 +481,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AtmosphereWebsocketConsumerBuilder exceptionHandler(
                 String exceptionHandler) {
@@ -485,7 +491,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -494,7 +500,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder exchangePattern(
                 String exchangePattern) {
@@ -504,7 +511,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * Whitelist of accepted filename extensions for accepting uploaded
          * files. Multiple extensions can be separated by comma, such as
-         * txt,xml. The option is a java.lang.String type.
+         * txt,xml. The option is a <code>java.lang.String</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder fileNameExtWhitelist(
                 String fileNameExtWhitelist) {
@@ -513,7 +520,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
         }
         /**
          * Specifies whether to enable HTTP OPTIONS for this Servlet consumer.
-         * By default OPTIONS is turned off. The option is a boolean type.
+         * By default OPTIONS is turned off. The option is a
+         * <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder optionsEnabled(
                 boolean optionsEnabled) {
@@ -523,7 +531,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * Specifies whether to enable HTTP OPTIONS for this Servlet consumer.
          * By default OPTIONS is turned off. The option will be converted to a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder optionsEnabled(
                 String optionsEnabled) {
@@ -532,7 +540,8 @@ public interface AtmosphereWebsocketEndpointBuilder {
         }
         /**
          * Specifies whether to enable HTTP TRACE for this Servlet consumer. By
-         * default TRACE is turned off. The option is a boolean type.
+         * default TRACE is turned off. The option is a <code>boolean</code>
+         * type.
          */
         public AtmosphereWebsocketConsumerBuilder traceEnabled(
                 boolean traceEnabled) {
@@ -542,7 +551,7 @@ public interface AtmosphereWebsocketEndpointBuilder {
         /**
          * Specifies whether to enable HTTP TRACE for this Servlet consumer. By
          * default TRACE is turned off. The option will be converted to a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public AtmosphereWebsocketConsumerBuilder traceEnabled(
                 String traceEnabled) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomEndpointBuilder.java
index 6777707..a84fd8c 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomEndpointBuilder.java
@@ -46,7 +46,8 @@ public interface AtomEndpointBuilder {
             super("atom", path);
         }
         /**
-         * The URI to the feed to poll. The option is a java.lang.String type.
+         * The URI to the feed to poll. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T feedUri(String feedUri) {
             this.properties.put("feedUri", feedUri);
@@ -54,7 +55,7 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Sets whether to add the feed object as a header. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T feedHeader(boolean feedHeader) {
             this.properties.put("feedHeader", feedHeader);
@@ -62,7 +63,7 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Sets whether to add the feed object as a header. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T feedHeader(String feedHeader) {
             this.properties.put("feedHeader", feedHeader);
@@ -70,7 +71,7 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Sets whether to use filtering or not of the entries. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T filter(boolean filter) {
             this.properties.put("filter", filter);
@@ -78,7 +79,7 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Sets whether to use filtering or not of the entries. The option will
-         * be converted to a boolean type.
+         * be converted to a <code>boolean</code> type.
          */
         public T filter(String filter) {
             this.properties.put("filter", filter);
@@ -87,7 +88,7 @@ public interface AtomEndpointBuilder {
         /**
          * Sets the timestamp to be used for filtering entries from the atom
          * feeds. This options is only in conjunction with the splitEntries. The
-         * option is a java.util.Date type.
+         * option is a <code>java.util.Date</code> type.
          */
         public T lastUpdate(Date lastUpdate) {
             this.properties.put("lastUpdate", lastUpdate);
@@ -96,7 +97,7 @@ public interface AtomEndpointBuilder {
         /**
          * Sets the timestamp to be used for filtering entries from the atom
          * feeds. This options is only in conjunction with the splitEntries. The
-         * option will be converted to a java.util.Date type.
+         * option will be converted to a <code>java.util.Date</code> type.
          */
         public T lastUpdate(String lastUpdate) {
             this.properties.put("lastUpdate", lastUpdate);
@@ -104,7 +105,7 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Sets the password to be used for basic authentication when polling
-         * from a HTTP feed. The option is a java.lang.String type.
+         * from a HTTP feed. The option is a <code>java.lang.String</code> type.
          */
         public T password(String password) {
             this.properties.put("password", password);
@@ -112,7 +113,7 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Sets whether to sort entries by published date. Only works when
-         * splitEntries = true. The option is a boolean type.
+         * splitEntries = true. The option is a <code>boolean</code> type.
          */
         public T sortEntries(boolean sortEntries) {
             this.properties.put("sortEntries", sortEntries);
@@ -120,7 +121,8 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Sets whether to sort entries by published date. Only works when
-         * splitEntries = true. The option will be converted to a boolean type.
+         * splitEntries = true. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T sortEntries(String sortEntries) {
             this.properties.put("sortEntries", sortEntries);
@@ -129,7 +131,7 @@ public interface AtomEndpointBuilder {
         /**
          * Sets whether or not entries should be sent individually or whether
          * the entire feed should be sent as a single message. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public T splitEntries(boolean splitEntries) {
             this.properties.put("splitEntries", splitEntries);
@@ -138,7 +140,7 @@ public interface AtomEndpointBuilder {
         /**
          * Sets whether or not entries should be sent individually or whether
          * the entire feed should be sent as a single message. The option will
-         * be converted to a boolean type.
+         * be converted to a <code>boolean</code> type.
          */
         public T splitEntries(String splitEntries) {
             this.properties.put("splitEntries", splitEntries);
@@ -148,7 +150,7 @@ public interface AtomEndpointBuilder {
          * Sets whether all entries identified in a single feed poll should be
          * delivered immediately. If true, only one entry is processed per
          * consumer.delay. Only applicable when splitEntries = true. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T throttleEntries(boolean throttleEntries) {
             this.properties.put("throttleEntries", throttleEntries);
@@ -158,7 +160,7 @@ public interface AtomEndpointBuilder {
          * Sets whether all entries identified in a single feed poll should be
          * delivered immediately. If true, only one entry is processed per
          * consumer.delay. Only applicable when splitEntries = true. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T throttleEntries(String throttleEntries) {
             this.properties.put("throttleEntries", throttleEntries);
@@ -166,7 +168,7 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Sets the username to be used for basic authentication when polling
-         * from a HTTP feed. The option is a java.lang.String type.
+         * from a HTTP feed. The option is a <code>java.lang.String</code> type.
          */
         public T username(String username) {
             this.properties.put("username", username);
@@ -175,7 +177,7 @@ public interface AtomEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -184,7 +186,7 @@ public interface AtomEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -193,7 +195,7 @@ public interface AtomEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -202,7 +204,7 @@ public interface AtomEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -225,7 +227,7 @@ public interface AtomEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AtomConsumerBuilder bridgeErrorHandler(boolean bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -238,7 +240,7 @@ public interface AtomEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AtomConsumerBuilder bridgeErrorHandler(String bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -247,7 +249,7 @@ public interface AtomEndpointBuilder {
         /**
          * If the polling consumer did not poll any files, you can enable this
          * option to send an empty message (no body) instead. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public AtomConsumerBuilder sendEmptyMessageWhenIdle(
                 boolean sendEmptyMessageWhenIdle) {
@@ -257,7 +259,7 @@ public interface AtomEndpointBuilder {
         /**
          * If the polling consumer did not poll any files, you can enable this
          * option to send an empty message (no body) instead. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public AtomConsumerBuilder sendEmptyMessageWhenIdle(
                 String sendEmptyMessageWhenIdle) {
@@ -269,7 +271,7 @@ public interface AtomEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AtomConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -281,7 +283,8 @@ public interface AtomEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AtomConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -289,7 +292,7 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -298,7 +301,8 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
@@ -309,7 +313,7 @@ public interface AtomEndpointBuilder {
          * you to provide your custom implementation to control error handling
          * usually occurred during the poll operation before an Exchange have
          * been created and being routed in Camel. The option is a
-         * org.apache.camel.spi.PollingConsumerPollStrategy type.
+         * <code>org.apache.camel.spi.PollingConsumerPollStrategy</code> type.
          */
         public AtomConsumerBuilder pollStrategy(
                 PollingConsumerPollStrategy pollStrategy) {
@@ -321,7 +325,8 @@ public interface AtomEndpointBuilder {
          * you to provide your custom implementation to control error handling
          * usually occurred during the poll operation before an Exchange have
          * been created and being routed in Camel. The option will be converted
-         * to a org.apache.camel.spi.PollingConsumerPollStrategy type.
+         * to a <code>org.apache.camel.spi.PollingConsumerPollStrategy</code>
+         * type.
          */
         public AtomConsumerBuilder pollStrategy(String pollStrategy) {
             this.properties.put("pollStrategy", pollStrategy);
@@ -330,7 +335,7 @@ public interface AtomEndpointBuilder {
         /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in. The option
-         * is a int type.
+         * is a <code>int</code> type.
          */
         public AtomConsumerBuilder backoffErrorThreshold(
                 int backoffErrorThreshold) {
@@ -340,7 +345,7 @@ public interface AtomEndpointBuilder {
         /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in. The option
-         * will be converted to a int type.
+         * will be converted to a <code>int</code> type.
          */
         public AtomConsumerBuilder backoffErrorThreshold(
                 String backoffErrorThreshold) {
@@ -349,7 +354,8 @@ public interface AtomEndpointBuilder {
         }
         /**
          * The number of subsequent idle polls that should happen before the
-         * backoffMultipler should kick-in. The option is a int type.
+         * backoffMultipler should kick-in. The option is a <code>int</code>
+         * type.
          */
         public AtomConsumerBuilder backoffIdleThreshold(int backoffIdleThreshold) {
             this.properties.put("backoffIdleThreshold", backoffIdleThreshold);
@@ -358,7 +364,7 @@ public interface AtomEndpointBuilder {
         /**
          * The number of subsequent idle polls that should happen before the
          * backoffMultipler should kick-in. The option will be converted to a
-         * int type.
+         * <code>int</code> type.
          */
         public AtomConsumerBuilder backoffIdleThreshold(
                 String backoffIdleThreshold) {
@@ -371,7 +377,7 @@ public interface AtomEndpointBuilder {
          * the number of polls that will be skipped before the next actual
          * attempt is happening again. When this option is in use then
          * backoffIdleThreshold and/or backoffErrorThreshold must also be
-         * configured. The option is a int type.
+         * configured. The option is a <code>int</code> type.
          */
         public AtomConsumerBuilder backoffMultiplier(int backoffMultiplier) {
             this.properties.put("backoffMultiplier", backoffMultiplier);
@@ -383,7 +389,7 @@ public interface AtomEndpointBuilder {
          * the number of polls that will be skipped before the next actual
          * attempt is happening again. When this option is in use then
          * backoffIdleThreshold and/or backoffErrorThreshold must also be
-         * configured. The option will be converted to a int type.
+         * configured. The option will be converted to a <code>int</code> type.
          */
         public AtomConsumerBuilder backoffMultiplier(String backoffMultiplier) {
             this.properties.put("backoffMultiplier", backoffMultiplier);
@@ -392,7 +398,7 @@ public interface AtomEndpointBuilder {
         /**
          * Milliseconds before the next poll. You can also specify time values
          * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option is a long type.
+         * seconds), and 1h (1 hour). The option is a <code>long</code> type.
          */
         public AtomConsumerBuilder delay(long delay) {
             this.properties.put("delay", delay);
@@ -401,8 +407,8 @@ public interface AtomEndpointBuilder {
         /**
          * Milliseconds before the next poll. You can also specify time values
          * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option will be converted to a long
-         * type.
+         * seconds), and 1h (1 hour). The option will be converted to a
+         * <code>long</code> type.
          */
         public AtomConsumerBuilder delay(String delay) {
             this.properties.put("delay", delay);
@@ -411,7 +417,7 @@ public interface AtomEndpointBuilder {
         /**
          * If greedy is enabled, then the ScheduledPollConsumer will run
          * immediately again, if the previous run polled 1 or more messages. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public AtomConsumerBuilder greedy(boolean greedy) {
             this.properties.put("greedy", greedy);
@@ -420,7 +426,7 @@ public interface AtomEndpointBuilder {
         /**
          * If greedy is enabled, then the ScheduledPollConsumer will run
          * immediately again, if the previous run polled 1 or more messages. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public AtomConsumerBuilder greedy(String greedy) {
             this.properties.put("greedy", greedy);
@@ -429,7 +435,7 @@ public interface AtomEndpointBuilder {
         /**
          * Milliseconds before the first poll starts. You can also specify time
          * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option is a long type.
+         * seconds), and 1h (1 hour). The option is a <code>long</code> type.
          */
         public AtomConsumerBuilder initialDelay(long initialDelay) {
             this.properties.put("initialDelay", initialDelay);
@@ -438,8 +444,8 @@ public interface AtomEndpointBuilder {
         /**
          * Milliseconds before the first poll starts. You can also specify time
          * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option will be converted to a long
-         * type.
+         * seconds), and 1h (1 hour). The option will be converted to a
+         * <code>long</code> type.
          */
         public AtomConsumerBuilder initialDelay(String initialDelay) {
             this.properties.put("initialDelay", initialDelay);
@@ -448,7 +454,7 @@ public interface AtomEndpointBuilder {
         /**
          * The consumer logs a start/complete log line when it polls. This
          * option allows you to configure the logging level for that. The option
-         * is a org.apache.camel.LoggingLevel type.
+         * is a <code>org.apache.camel.LoggingLevel</code> type.
          */
         public AtomConsumerBuilder runLoggingLevel(LoggingLevel runLoggingLevel) {
             this.properties.put("runLoggingLevel", runLoggingLevel);
@@ -457,7 +463,8 @@ public interface AtomEndpointBuilder {
         /**
          * The consumer logs a start/complete log line when it polls. This
          * option allows you to configure the logging level for that. The option
-         * will be converted to a org.apache.camel.LoggingLevel type.
+         * will be converted to a <code>org.apache.camel.LoggingLevel</code>
+         * type.
          */
         public AtomConsumerBuilder runLoggingLevel(String runLoggingLevel) {
             this.properties.put("runLoggingLevel", runLoggingLevel);
@@ -466,8 +473,8 @@ public interface AtomEndpointBuilder {
         /**
          * Allows for configuring a custom/shared thread pool to use for the
          * consumer. By default each consumer has its own single threaded thread
-         * pool. The option is a java.util.concurrent.ScheduledExecutorService
-         * type.
+         * pool. The option is a
+         * <code>java.util.concurrent.ScheduledExecutorService</code> type.
          */
         public AtomConsumerBuilder scheduledExecutorService(
                 ScheduledExecutorService scheduledExecutorService) {
@@ -478,7 +485,7 @@ public interface AtomEndpointBuilder {
          * Allows for configuring a custom/shared thread pool to use for the
          * consumer. By default each consumer has its own single threaded thread
          * pool. The option will be converted to a
-         * java.util.concurrent.ScheduledExecutorService type.
+         * <code>java.util.concurrent.ScheduledExecutorService</code> type.
          */
         public AtomConsumerBuilder scheduledExecutorService(
                 String scheduledExecutorService) {
@@ -488,7 +495,8 @@ public interface AtomEndpointBuilder {
         /**
          * To use a cron scheduler from either camel-spring or camel-quartz2
          * component. The option is a
-         * org.apache.camel.spi.ScheduledPollConsumerScheduler type.
+         * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code>
+         * type.
          */
         public AtomConsumerBuilder scheduler(
                 ScheduledPollConsumerScheduler scheduler) {
@@ -498,7 +506,8 @@ public interface AtomEndpointBuilder {
         /**
          * To use a cron scheduler from either camel-spring or camel-quartz2
          * component. The option will be converted to a
-         * org.apache.camel.spi.ScheduledPollConsumerScheduler type.
+         * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code>
+         * type.
          */
         public AtomConsumerBuilder scheduler(String scheduler) {
             this.properties.put("scheduler", scheduler);
@@ -507,7 +516,7 @@ public interface AtomEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * java.util.Map<java.lang.String,java.lang.Object> type.
+         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
          */
         public AtomConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -517,7 +526,8 @@ public interface AtomEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a java.util.Map<java.lang.String,java.lang.Object> type.
+         * converted to a <code>java.util.Map<java.lang.String,
+         * java.lang.Object></code> type.
          */
         public AtomConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
@@ -525,8 +535,8 @@ public interface AtomEndpointBuilder {
             return (AtomConsumerBuilder) this;
         }
         /**
-         * Whether the scheduler should be auto started. The option is a boolean
-         * type.
+         * Whether the scheduler should be auto started. The option is a
+         * <code>boolean</code> type.
          */
         public AtomConsumerBuilder startScheduler(boolean startScheduler) {
             this.properties.put("startScheduler", startScheduler);
@@ -534,7 +544,7 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Whether the scheduler should be auto started. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public AtomConsumerBuilder startScheduler(String startScheduler) {
             this.properties.put("startScheduler", startScheduler);
@@ -542,7 +552,7 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Time unit for initialDelay and delay options. The option is a
-         * java.util.concurrent.TimeUnit type.
+         * <code>java.util.concurrent.TimeUnit</code> type.
          */
         public AtomConsumerBuilder timeUnit(TimeUnit timeUnit) {
             this.properties.put("timeUnit", timeUnit);
@@ -550,7 +560,7 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Time unit for initialDelay and delay options. The option will be
-         * converted to a java.util.concurrent.TimeUnit type.
+         * converted to a <code>java.util.concurrent.TimeUnit</code> type.
          */
         public AtomConsumerBuilder timeUnit(String timeUnit) {
             this.properties.put("timeUnit", timeUnit);
@@ -558,8 +568,8 @@ public interface AtomEndpointBuilder {
         }
         /**
          * Controls if fixed delay or fixed rate is used. See
-         * ScheduledExecutorService in JDK for details. The option is a boolean
-         * type.
+         * ScheduledExecutorService in JDK for details. The option is a
+         * <code>boolean</code> type.
          */
         public AtomConsumerBuilder useFixedDelay(boolean useFixedDelay) {
             this.properties.put("useFixedDelay", useFixedDelay);
@@ -568,7 +578,7 @@ public interface AtomEndpointBuilder {
         /**
          * Controls if fixed delay or fixed rate is used. See
          * ScheduledExecutorService in JDK for details. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public AtomConsumerBuilder useFixedDelay(String useFixedDelay) {
             this.properties.put("useFixedDelay", useFixedDelay);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMapEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMapEndpointBuilder.java
index a61c9de..51a8cf3 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMapEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMapEndpointBuilder.java
@@ -42,14 +42,16 @@ public interface AtomixMapEndpointBuilder {
             super("atomix-map", path);
         }
         /**
-         * The distributed resource name. The option is a java.lang.String type.
+         * The distributed resource name. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T resourceName(String resourceName) {
             this.properties.put("resourceName", resourceName);
             return (T) this;
         }
         /**
-         * The Atomix instance to use. The option is a io.atomix.Atomix type.
+         * The Atomix instance to use. The option is a
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(Object atomix) {
             this.properties.put("atomix", atomix);
@@ -57,14 +59,15 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The Atomix instance to use. The option will be converted to a
-         * io.atomix.Atomix type.
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(String atomix) {
             this.properties.put("atomix", atomix);
             return (T) this;
         }
         /**
-         * The Atomix configuration uri. The option is a java.lang.String type.
+         * The Atomix configuration uri. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T configurationUri(String configurationUri) {
             this.properties.put("configurationUri", configurationUri);
@@ -72,15 +75,15 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The default action. The option is a
-         * org.apache.camel.component.atomix.client.map.AtomixMap.Action type.
+         * <code>org.apache.camel.component.atomix.client.map.AtomixMap$Action</code> type.
          */
-        public T defaultAction(Object defaultAction) {
+        public T defaultAction(Action defaultAction) {
             this.properties.put("defaultAction", defaultAction);
             return (T) this;
         }
         /**
          * The default action. The option will be converted to a
-         * org.apache.camel.component.atomix.client.map.AtomixMap.Action type.
+         * <code>org.apache.camel.component.atomix.client.map.AtomixMap$Action</code> type.
          */
         public T defaultAction(String defaultAction) {
             this.properties.put("defaultAction", defaultAction);
@@ -88,7 +91,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The key to use if none is set in the header or to listen for events
-         * for a specific key. The option is a java.lang.Object type.
+         * for a specific key. The option is a <code>java.lang.Object</code>
+         * type.
          */
         public T key(Object key) {
             this.properties.put("key", key);
@@ -97,7 +101,7 @@ public interface AtomixMapEndpointBuilder {
         /**
          * The key to use if none is set in the header or to listen for events
          * for a specific key. The option will be converted to a
-         * java.lang.Object type.
+         * <code>java.lang.Object</code> type.
          */
         public T key(String key) {
             this.properties.put("key", key);
@@ -105,7 +109,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * java.lang.String type.
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -113,7 +118,9 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option will be
-         * converted to a java.lang.String type.
+         * converted to a
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -121,7 +128,7 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The header that wil carry the result. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T resultHeader(String resultHeader) {
             this.properties.put("resultHeader", resultHeader);
@@ -129,7 +136,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -137,21 +145,23 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
             return (T) this;
         }
         /**
-         * The resource ttl. The option is a long type.
+         * The resource ttl. The option is a <code>long</code> type.
          */
         public T ttl(long ttl) {
             this.properties.put("ttl", ttl);
             return (T) this;
         }
         /**
-         * The resource ttl. The option will be converted to a long type.
+         * The resource ttl. The option will be converted to a <code>long</code>
+         * type.
          */
         public T ttl(String ttl) {
             this.properties.put("ttl", ttl);
@@ -160,7 +170,7 @@ public interface AtomixMapEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -169,7 +179,7 @@ public interface AtomixMapEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -177,7 +187,7 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(Properties defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -185,7 +195,7 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option will be
-         * converted to a java.util.Properties type.
+         * converted to a <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(String defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -193,7 +203,7 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The local default resource options. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(Properties defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -201,7 +211,7 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The local default resource options. The option will be converted to a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(String defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -210,8 +220,8 @@ public interface AtomixMapEndpointBuilder {
         /**
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
-         * generated ID thus the local one is ignored. The option is a boolean
-         * type.
+         * generated ID thus the local one is ignored. The option is a
+         * <code>boolean</code> type.
          */
         public T ephemeral(boolean ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -221,7 +231,7 @@ public interface AtomixMapEndpointBuilder {
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
          * generated ID thus the local one is ignored. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T ephemeral(String ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -229,7 +239,7 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The read consistency level. The option is a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(ReadConsistency readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -237,7 +247,7 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The read consistency level. The option will be converted to a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(String readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -245,7 +255,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -253,7 +264,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a java.util.Map<java.lang.String,java.util.Properties> type.
+         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -261,7 +273,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -269,7 +282,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -278,7 +292,7 @@ public interface AtomixMapEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -287,7 +301,7 @@ public interface AtomixMapEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -310,7 +324,7 @@ public interface AtomixMapEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AtomixMapConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -324,7 +338,7 @@ public interface AtomixMapEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AtomixMapConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -336,7 +350,7 @@ public interface AtomixMapEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AtomixMapConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -348,7 +362,8 @@ public interface AtomixMapEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AtomixMapConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -356,7 +371,7 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixMapConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -365,7 +380,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixMapConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
@@ -383,6 +399,10 @@ public interface AtomixMapEndpointBuilder {
         }
     }
 
+    public static enum Action {
+        PUT, PUT_IF_ABSENT, GET, CLEAR, SIZE, CONTAINS_KEY, CONTAINS_VALUE, IS_EMPTY, ENTRY_SET, REMOVE, REPLACE, VALUES;
+    }
+
     public static enum ReadConsistency {
         ATOMIC, ATOMIC_LEASE, SEQUENTIAL, LOCAL;
     }
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMessagingEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMessagingEndpointBuilder.java
index 9985d1b..9d92a86 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMessagingEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMessagingEndpointBuilder.java
@@ -42,14 +42,16 @@ public interface AtomixMessagingEndpointBuilder {
             super("atomix-messaging", path);
         }
         /**
-         * The distributed resource name. The option is a java.lang.String type.
+         * The distributed resource name. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T resourceName(String resourceName) {
             this.properties.put("resourceName", resourceName);
             return (T) this;
         }
         /**
-         * The Atomix instance to use. The option is a io.atomix.Atomix type.
+         * The Atomix instance to use. The option is a
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(Object atomix) {
             this.properties.put("atomix", atomix);
@@ -57,7 +59,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The Atomix instance to use. The option will be converted to a
-         * io.atomix.Atomix type.
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(String atomix) {
             this.properties.put("atomix", atomix);
@@ -65,29 +67,31 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The broadcast type. The option is a
-         * org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType type.
+         * <code>org.apache.camel.component.atomix.client.messaging.AtomixMessaging$BroadcastType</code> type.
          */
-        public T broadcastType(Object broadcastType) {
+        public T broadcastType(BroadcastType broadcastType) {
             this.properties.put("broadcastType", broadcastType);
             return (T) this;
         }
         /**
          * The broadcast type. The option will be converted to a
-         * org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType type.
+         * <code>org.apache.camel.component.atomix.client.messaging.AtomixMessaging$BroadcastType</code> type.
          */
         public T broadcastType(String broadcastType) {
             this.properties.put("broadcastType", broadcastType);
             return (T) this;
         }
         /**
-         * The messaging channel name. The option is a java.lang.String type.
+         * The messaging channel name. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T channelName(String channelName) {
             this.properties.put("channelName", channelName);
             return (T) this;
         }
         /**
-         * The Atomix configuration uri. The option is a java.lang.String type.
+         * The Atomix configuration uri. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T configurationUri(String configurationUri) {
             this.properties.put("configurationUri", configurationUri);
@@ -95,22 +99,23 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The default action. The option is a
-         * org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action type.
+         * <code>org.apache.camel.component.atomix.client.messaging.AtomixMessaging$Action</code> type.
          */
-        public T defaultAction(Object defaultAction) {
+        public T defaultAction(Action defaultAction) {
             this.properties.put("defaultAction", defaultAction);
             return (T) this;
         }
         /**
          * The default action. The option will be converted to a
-         * org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action type.
+         * <code>org.apache.camel.component.atomix.client.messaging.AtomixMessaging$Action</code> type.
          */
         public T defaultAction(String defaultAction) {
             this.properties.put("defaultAction", defaultAction);
             return (T) this;
         }
         /**
-         * The Atomix Group member name. The option is a java.lang.String type.
+         * The Atomix Group member name. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T memberName(String memberName) {
             this.properties.put("memberName", memberName);
@@ -118,7 +123,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * java.lang.String type.
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -126,7 +132,9 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option will be
-         * converted to a java.lang.String type.
+         * converted to a
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -134,7 +142,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The header that wil carry the result. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T resultHeader(String resultHeader) {
             this.properties.put("resultHeader", resultHeader);
@@ -142,7 +150,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -150,7 +159,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
@@ -159,7 +169,7 @@ public interface AtomixMessagingEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -168,7 +178,7 @@ public interface AtomixMessagingEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -176,7 +186,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(Properties defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -184,7 +194,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option will be
-         * converted to a java.util.Properties type.
+         * converted to a <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(String defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -192,7 +202,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The local default resource options. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(Properties defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -200,7 +210,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The local default resource options. The option will be converted to a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(String defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -209,8 +219,8 @@ public interface AtomixMessagingEndpointBuilder {
         /**
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
-         * generated ID thus the local one is ignored. The option is a boolean
-         * type.
+         * generated ID thus the local one is ignored. The option is a
+         * <code>boolean</code> type.
          */
         public T ephemeral(boolean ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -220,7 +230,7 @@ public interface AtomixMessagingEndpointBuilder {
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
          * generated ID thus the local one is ignored. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T ephemeral(String ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -228,7 +238,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The read consistency level. The option is a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(ReadConsistency readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -236,7 +246,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The read consistency level. The option will be converted to a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(String readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -244,7 +254,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -252,7 +263,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a java.util.Map<java.lang.String,java.util.Properties> type.
+         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -260,7 +272,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -268,7 +281,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -277,7 +291,7 @@ public interface AtomixMessagingEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -286,7 +300,7 @@ public interface AtomixMessagingEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -309,7 +323,7 @@ public interface AtomixMessagingEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AtomixMessagingConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -323,7 +337,7 @@ public interface AtomixMessagingEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AtomixMessagingConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -335,7 +349,7 @@ public interface AtomixMessagingEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AtomixMessagingConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -347,7 +361,8 @@ public interface AtomixMessagingEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AtomixMessagingConsumerBuilder exceptionHandler(
                 String exceptionHandler) {
@@ -356,7 +371,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixMessagingConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -365,7 +380,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixMessagingConsumerBuilder exchangePattern(
                 String exchangePattern) {
@@ -384,6 +400,14 @@ public interface AtomixMessagingEndpointBuilder {
         }
     }
 
+    public static enum BroadcastType {
+        ALL, RANDOM;
+    }
+
+    public static enum Action {
+        DIRECT, BROADCAST;
+    }
+
     public static enum ReadConsistency {
         ATOMIC, ATOMIC_LEASE, SEQUENTIAL, LOCAL;
     }
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMultiMapEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMultiMapEndpointBuilder.java
index 3a34584..b55183b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMultiMapEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMultiMapEndpointBuilder.java
@@ -43,14 +43,16 @@ public interface AtomixMultiMapEndpointBuilder {
             super("atomix-multimap", path);
         }
         /**
-         * The distributed resource name. The option is a java.lang.String type.
+         * The distributed resource name. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T resourceName(String resourceName) {
             this.properties.put("resourceName", resourceName);
             return (T) this;
         }
         /**
-         * The Atomix instance to use. The option is a io.atomix.Atomix type.
+         * The Atomix instance to use. The option is a
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(Object atomix) {
             this.properties.put("atomix", atomix);
@@ -58,14 +60,15 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The Atomix instance to use. The option will be converted to a
-         * io.atomix.Atomix type.
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(String atomix) {
             this.properties.put("atomix", atomix);
             return (T) this;
         }
         /**
-         * The Atomix configuration uri. The option is a java.lang.String type.
+         * The Atomix configuration uri. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T configurationUri(String configurationUri) {
             this.properties.put("configurationUri", configurationUri);
@@ -73,15 +76,15 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The default action. The option is a
-         * org.apache.camel.component.atomix.client.multimap.AtomixMultiMap.Action type.
+         * <code>org.apache.camel.component.atomix.client.multimap.AtomixMultiMap$Action</code> type.
          */
-        public T defaultAction(Object defaultAction) {
+        public T defaultAction(Action defaultAction) {
             this.properties.put("defaultAction", defaultAction);
             return (T) this;
         }
         /**
          * The default action. The option will be converted to a
-         * org.apache.camel.component.atomix.client.multimap.AtomixMultiMap.Action type.
+         * <code>org.apache.camel.component.atomix.client.multimap.AtomixMultiMap$Action</code> type.
          */
         public T defaultAction(String defaultAction) {
             this.properties.put("defaultAction", defaultAction);
@@ -89,7 +92,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The key to use if none is set in the header or to listen for events
-         * for a specific key. The option is a java.lang.Object type.
+         * for a specific key. The option is a <code>java.lang.Object</code>
+         * type.
          */
         public T key(Object key) {
             this.properties.put("key", key);
@@ -98,7 +102,7 @@ public interface AtomixMultiMapEndpointBuilder {
         /**
          * The key to use if none is set in the header or to listen for events
          * for a specific key. The option will be converted to a
-         * java.lang.Object type.
+         * <code>java.lang.Object</code> type.
          */
         public T key(String key) {
             this.properties.put("key", key);
@@ -106,7 +110,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * java.lang.String type.
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -114,7 +119,9 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option will be
-         * converted to a java.lang.String type.
+         * converted to a
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -122,7 +129,7 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The header that wil carry the result. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T resultHeader(String resultHeader) {
             this.properties.put("resultHeader", resultHeader);
@@ -130,7 +137,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -138,21 +146,23 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
             return (T) this;
         }
         /**
-         * The resource ttl. The option is a long type.
+         * The resource ttl. The option is a <code>long</code> type.
          */
         public T ttl(long ttl) {
             this.properties.put("ttl", ttl);
             return (T) this;
         }
         /**
-         * The resource ttl. The option will be converted to a long type.
+         * The resource ttl. The option will be converted to a <code>long</code>
+         * type.
          */
         public T ttl(String ttl) {
             this.properties.put("ttl", ttl);
@@ -161,7 +171,7 @@ public interface AtomixMultiMapEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -170,7 +180,7 @@ public interface AtomixMultiMapEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -178,7 +188,7 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(Properties defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -186,7 +196,7 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option will be
-         * converted to a java.util.Properties type.
+         * converted to a <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(String defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -194,7 +204,7 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The local default resource options. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(Properties defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -202,7 +212,7 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The local default resource options. The option will be converted to a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(String defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -211,8 +221,8 @@ public interface AtomixMultiMapEndpointBuilder {
         /**
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
-         * generated ID thus the local one is ignored. The option is a boolean
-         * type.
+         * generated ID thus the local one is ignored. The option is a
+         * <code>boolean</code> type.
          */
         public T ephemeral(boolean ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -222,7 +232,7 @@ public interface AtomixMultiMapEndpointBuilder {
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
          * generated ID thus the local one is ignored. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T ephemeral(String ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -230,7 +240,7 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The read consistency level. The option is a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(ReadConsistency readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -238,7 +248,7 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The read consistency level. The option will be converted to a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(String readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -246,7 +256,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -254,7 +265,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a java.util.Map<java.lang.String,java.util.Properties> type.
+         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -262,7 +274,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -270,7 +283,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -279,7 +293,7 @@ public interface AtomixMultiMapEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -288,7 +302,7 @@ public interface AtomixMultiMapEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -311,7 +325,7 @@ public interface AtomixMultiMapEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AtomixMultiMapConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -325,7 +339,7 @@ public interface AtomixMultiMapEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AtomixMultiMapConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -337,7 +351,7 @@ public interface AtomixMultiMapEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AtomixMultiMapConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -349,7 +363,8 @@ public interface AtomixMultiMapEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AtomixMultiMapConsumerBuilder exceptionHandler(
                 String exceptionHandler) {
@@ -358,7 +373,7 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixMultiMapConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -367,7 +382,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixMultiMapConsumerBuilder exchangePattern(
                 String exchangePattern) {
@@ -376,6 +392,10 @@ public interface AtomixMultiMapEndpointBuilder {
         }
     }
 
+    public static enum Action {
+        PUT, GET, CLEAR, SIZE, CONTAINS_KEY, IS_EMPTY, REMOVE, REMOVE_VALUE;
+    }
+
     public static enum ReadConsistency {
         ATOMIC, ATOMIC_LEASE, SEQUENTIAL, LOCAL;
     }
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixQueueEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixQueueEndpointBuilder.java
index 47cbc6a..e16feb2 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixQueueEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixQueueEndpointBuilder.java
@@ -42,14 +42,16 @@ public interface AtomixQueueEndpointBuilder {
             super("atomix-queue", path);
         }
         /**
-         * The distributed resource name. The option is a java.lang.String type.
+         * The distributed resource name. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T resourceName(String resourceName) {
             this.properties.put("resourceName", resourceName);
             return (T) this;
         }
         /**
-         * The Atomix instance to use. The option is a io.atomix.Atomix type.
+         * The Atomix instance to use. The option is a
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(Object atomix) {
             this.properties.put("atomix", atomix);
@@ -57,14 +59,15 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The Atomix instance to use. The option will be converted to a
-         * io.atomix.Atomix type.
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(String atomix) {
             this.properties.put("atomix", atomix);
             return (T) this;
         }
         /**
-         * The Atomix configuration uri. The option is a java.lang.String type.
+         * The Atomix configuration uri. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T configurationUri(String configurationUri) {
             this.properties.put("configurationUri", configurationUri);
@@ -72,17 +75,15 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The default action. The option is a
-         * org.apache.camel.component.atomix.client.queue.AtomixQueue.Action
-         * type.
+         * <code>org.apache.camel.component.atomix.client.queue.AtomixQueue$Action</code> type.
          */
-        public T defaultAction(Object defaultAction) {
+        public T defaultAction(Action defaultAction) {
             this.properties.put("defaultAction", defaultAction);
             return (T) this;
         }
         /**
          * The default action. The option will be converted to a
-         * org.apache.camel.component.atomix.client.queue.AtomixQueue.Action
-         * type.
+         * <code>org.apache.camel.component.atomix.client.queue.AtomixQueue$Action</code> type.
          */
         public T defaultAction(String defaultAction) {
             this.properties.put("defaultAction", defaultAction);
@@ -90,7 +91,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * java.lang.String type.
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -98,7 +100,9 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option will be
-         * converted to a java.lang.String type.
+         * converted to a
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -106,7 +110,7 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The header that wil carry the result. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T resultHeader(String resultHeader) {
             this.properties.put("resultHeader", resultHeader);
@@ -114,7 +118,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -122,7 +127,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
@@ -131,7 +137,7 @@ public interface AtomixQueueEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -140,7 +146,7 @@ public interface AtomixQueueEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -148,7 +154,7 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(Properties defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -156,7 +162,7 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option will be
-         * converted to a java.util.Properties type.
+         * converted to a <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(String defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -164,7 +170,7 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The local default resource options. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(Properties defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -172,7 +178,7 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The local default resource options. The option will be converted to a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(String defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -181,8 +187,8 @@ public interface AtomixQueueEndpointBuilder {
         /**
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
-         * generated ID thus the local one is ignored. The option is a boolean
-         * type.
+         * generated ID thus the local one is ignored. The option is a
+         * <code>boolean</code> type.
          */
         public T ephemeral(boolean ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -192,7 +198,7 @@ public interface AtomixQueueEndpointBuilder {
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
          * generated ID thus the local one is ignored. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T ephemeral(String ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -200,7 +206,7 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The read consistency level. The option is a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(ReadConsistency readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -208,7 +214,7 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The read consistency level. The option will be converted to a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(String readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -216,7 +222,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -224,7 +231,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a java.util.Map<java.lang.String,java.util.Properties> type.
+         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -232,7 +240,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -240,7 +249,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -249,7 +259,7 @@ public interface AtomixQueueEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -258,7 +268,7 @@ public interface AtomixQueueEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -281,7 +291,7 @@ public interface AtomixQueueEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AtomixQueueConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -295,7 +305,7 @@ public interface AtomixQueueEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AtomixQueueConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -307,7 +317,7 @@ public interface AtomixQueueEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AtomixQueueConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -319,7 +329,8 @@ public interface AtomixQueueEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AtomixQueueConsumerBuilder exceptionHandler(
                 String exceptionHandler) {
@@ -328,7 +339,7 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixQueueConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -337,7 +348,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixQueueConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
@@ -355,6 +367,10 @@ public interface AtomixQueueEndpointBuilder {
         }
     }
 
+    public static enum Action {
+        ADD, OFFER, PEEK, POLL, CLEAR, CONTAINS, IS_EMPTY, REMOVE, SIZE;
+    }
+
     public static enum ReadConsistency {
         ATOMIC, ATOMIC_LEASE, SEQUENTIAL, LOCAL;
     }
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixSetEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixSetEndpointBuilder.java
index 0a0ee60..cca708a 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixSetEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixSetEndpointBuilder.java
@@ -42,14 +42,16 @@ public interface AtomixSetEndpointBuilder {
             super("atomix-set", path);
         }
         /**
-         * The distributed resource name. The option is a java.lang.String type.
+         * The distributed resource name. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T resourceName(String resourceName) {
             this.properties.put("resourceName", resourceName);
             return (T) this;
         }
         /**
-         * The Atomix instance to use. The option is a io.atomix.Atomix type.
+         * The Atomix instance to use. The option is a
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(Object atomix) {
             this.properties.put("atomix", atomix);
@@ -57,14 +59,15 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The Atomix instance to use. The option will be converted to a
-         * io.atomix.Atomix type.
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(String atomix) {
             this.properties.put("atomix", atomix);
             return (T) this;
         }
         /**
-         * The Atomix configuration uri. The option is a java.lang.String type.
+         * The Atomix configuration uri. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T configurationUri(String configurationUri) {
             this.properties.put("configurationUri", configurationUri);
@@ -72,15 +75,15 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The default action. The option is a
-         * org.apache.camel.component.atomix.client.set.AtomixSet.Action type.
+         * <code>org.apache.camel.component.atomix.client.set.AtomixSet$Action</code> type.
          */
-        public T defaultAction(Object defaultAction) {
+        public T defaultAction(Action defaultAction) {
             this.properties.put("defaultAction", defaultAction);
             return (T) this;
         }
         /**
          * The default action. The option will be converted to a
-         * org.apache.camel.component.atomix.client.set.AtomixSet.Action type.
+         * <code>org.apache.camel.component.atomix.client.set.AtomixSet$Action</code> type.
          */
         public T defaultAction(String defaultAction) {
             this.properties.put("defaultAction", defaultAction);
@@ -88,7 +91,8 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * java.lang.String type.
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -96,7 +100,9 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option will be
-         * converted to a java.lang.String type.
+         * converted to a
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -104,7 +110,7 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The header that wil carry the result. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T resultHeader(String resultHeader) {
             this.properties.put("resultHeader", resultHeader);
@@ -112,7 +118,8 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -120,21 +127,23 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
             return (T) this;
         }
         /**
-         * The resource ttl. The option is a long type.
+         * The resource ttl. The option is a <code>long</code> type.
          */
         public T ttl(long ttl) {
             this.properties.put("ttl", ttl);
             return (T) this;
         }
         /**
-         * The resource ttl. The option will be converted to a long type.
+         * The resource ttl. The option will be converted to a <code>long</code>
+         * type.
          */
         public T ttl(String ttl) {
             this.properties.put("ttl", ttl);
@@ -143,7 +152,7 @@ public interface AtomixSetEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -152,7 +161,7 @@ public interface AtomixSetEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -160,7 +169,7 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(Properties defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -168,7 +177,7 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option will be
-         * converted to a java.util.Properties type.
+         * converted to a <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(String defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -176,7 +185,7 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The local default resource options. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(Properties defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -184,7 +193,7 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The local default resource options. The option will be converted to a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(String defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -193,8 +202,8 @@ public interface AtomixSetEndpointBuilder {
         /**
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
-         * generated ID thus the local one is ignored. The option is a boolean
-         * type.
+         * generated ID thus the local one is ignored. The option is a
+         * <code>boolean</code> type.
          */
         public T ephemeral(boolean ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -204,7 +213,7 @@ public interface AtomixSetEndpointBuilder {
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
          * generated ID thus the local one is ignored. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T ephemeral(String ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -212,7 +221,7 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The read consistency level. The option is a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(ReadConsistency readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -220,7 +229,7 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The read consistency level. The option will be converted to a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(String readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -228,7 +237,8 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -236,7 +246,8 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a java.util.Map<java.lang.String,java.util.Properties> type.
+         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -244,7 +255,8 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -252,7 +264,8 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -261,7 +274,7 @@ public interface AtomixSetEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -270,7 +283,7 @@ public interface AtomixSetEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -293,7 +306,7 @@ public interface AtomixSetEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AtomixSetConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -307,7 +320,7 @@ public interface AtomixSetEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AtomixSetConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -319,7 +332,7 @@ public interface AtomixSetEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AtomixSetConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -331,7 +344,8 @@ public interface AtomixSetEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AtomixSetConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -339,7 +353,7 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixSetConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -348,7 +362,8 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixSetConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
@@ -366,6 +381,10 @@ public interface AtomixSetEndpointBuilder {
         }
     }
 
+    public static enum Action {
+        ADD, CLEAR, CONTAINS, IS_EMPTY, REMOVE, SIZE;
+    }
+
     public static enum ReadConsistency {
         ATOMIC, ATOMIC_LEASE, SEQUENTIAL, LOCAL;
     }
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixValueEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixValueEndpointBuilder.java
index 3c8edf3..a94a6dd 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixValueEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixValueEndpointBuilder.java
@@ -42,14 +42,16 @@ public interface AtomixValueEndpointBuilder {
             super("atomix-value", path);
         }
         /**
-         * The distributed resource name. The option is a java.lang.String type.
+         * The distributed resource name. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T resourceName(String resourceName) {
             this.properties.put("resourceName", resourceName);
             return (T) this;
         }
         /**
-         * The Atomix instance to use. The option is a io.atomix.Atomix type.
+         * The Atomix instance to use. The option is a
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(Object atomix) {
             this.properties.put("atomix", atomix);
@@ -57,14 +59,15 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The Atomix instance to use. The option will be converted to a
-         * io.atomix.Atomix type.
+         * <code>io.atomix.AtomixClient</code> type.
          */
         public T atomix(String atomix) {
             this.properties.put("atomix", atomix);
             return (T) this;
         }
         /**
-         * The Atomix configuration uri. The option is a java.lang.String type.
+         * The Atomix configuration uri. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T configurationUri(String configurationUri) {
             this.properties.put("configurationUri", configurationUri);
@@ -72,17 +75,15 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The default action. The option is a
-         * org.apache.camel.component.atomix.client.value.AtomixValue.Action
-         * type.
+         * <code>org.apache.camel.component.atomix.client.value.AtomixValue$Action</code> type.
          */
-        public T defaultAction(Object defaultAction) {
+        public T defaultAction(Action defaultAction) {
             this.properties.put("defaultAction", defaultAction);
             return (T) this;
         }
         /**
          * The default action. The option will be converted to a
-         * org.apache.camel.component.atomix.client.value.AtomixValue.Action
-         * type.
+         * <code>org.apache.camel.component.atomix.client.value.AtomixValue$Action</code> type.
          */
         public T defaultAction(String defaultAction) {
             this.properties.put("defaultAction", defaultAction);
@@ -90,7 +91,8 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * java.lang.String type.
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -98,7 +100,9 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option will be
-         * converted to a java.lang.String type.
+         * converted to a
+         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
+         * type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -106,7 +110,7 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The header that wil carry the result. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T resultHeader(String resultHeader) {
             this.properties.put("resultHeader", resultHeader);
@@ -114,7 +118,8 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -122,21 +127,23 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * io.atomix.catalyst.transport.Transport type.
+         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
+         * type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
             return (T) this;
         }
         /**
-         * The resource ttl. The option is a long type.
+         * The resource ttl. The option is a <code>long</code> type.
          */
         public T ttl(long ttl) {
             this.properties.put("ttl", ttl);
             return (T) this;
         }
         /**
-         * The resource ttl. The option will be converted to a long type.
+         * The resource ttl. The option will be converted to a <code>long</code>
+         * type.
          */
         public T ttl(String ttl) {
             this.properties.put("ttl", ttl);
@@ -145,7 +152,7 @@ public interface AtomixValueEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -154,7 +161,7 @@ public interface AtomixValueEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -162,7 +169,7 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(Properties defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -170,7 +177,7 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The cluster wide default resource configuration. The option will be
-         * converted to a java.util.Properties type.
+         * converted to a <code>java.util.Properties</code> type.
          */
         public T defaultResourceConfig(String defaultResourceConfig) {
             this.properties.put("defaultResourceConfig", defaultResourceConfig);
@@ -178,7 +185,7 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The local default resource options. The option is a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(Properties defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -186,7 +193,7 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The local default resource options. The option will be converted to a
-         * java.util.Properties type.
+         * <code>java.util.Properties</code> type.
          */
         public T defaultResourceOptions(String defaultResourceOptions) {
             this.properties.put("defaultResourceOptions", defaultResourceOptions);
@@ -195,8 +202,8 @@ public interface AtomixValueEndpointBuilder {
         /**
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
-         * generated ID thus the local one is ignored. The option is a boolean
-         * type.
+         * generated ID thus the local one is ignored. The option is a
+         * <code>boolean</code> type.
          */
         public T ephemeral(boolean ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -206,7 +213,7 @@ public interface AtomixValueEndpointBuilder {
          * Sets if the local member should join groups as PersistentMember or
          * not. If set to ephemeral the local member will receive an auto
          * generated ID thus the local one is ignored. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public T ephemeral(String ephemeral) {
             this.properties.put("ephemeral", ephemeral);
@@ -214,7 +221,7 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The read consistency level. The option is a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(ReadConsistency readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -222,7 +229,7 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The read consistency level. The option will be converted to a
-         * io.atomix.resource.ReadConsistency type.
+         * <code>io.atomix.resource.ReadConsistency</code> type.
          */
         public T readConsistency(String readConsistency) {
             this.properties.put("readConsistency", readConsistency);
@@ -230,7 +237,8 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -238,7 +246,8 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a java.util.Map<java.lang.String,java.util.Properties> type.
+         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -246,7 +255,8 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -254,7 +264,8 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * java.util.Map<java.lang.String,java.util.Properties> type.
+         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
+         * type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -263,7 +274,7 @@ public interface AtomixValueEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -272,7 +283,7 @@ public interface AtomixValueEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -295,7 +306,7 @@ public interface AtomixValueEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AtomixValueConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -309,7 +320,7 @@ public interface AtomixValueEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AtomixValueConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -321,7 +332,7 @@ public interface AtomixValueEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AtomixValueConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -333,7 +344,8 @@ public interface AtomixValueEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AtomixValueConsumerBuilder exceptionHandler(
                 String exceptionHandler) {
@@ -342,7 +354,7 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixValueConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -351,7 +363,8 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AtomixValueConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
@@ -369,6 +382,10 @@ public interface AtomixValueEndpointBuilder {
         }
     }
 
+    public static enum Action {
+        SET, GET, GET_AND_SET, COMPARE_AND_SET;
+    }
+
     public static enum ReadConsistency {
         ATOMIC, ATOMIC_LEASE, SEQUENTIAL, LOCAL;
     }
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AvroEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AvroEndpointBuilder.java
index 1516430..bc19e09 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AvroEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AvroEndpointBuilder.java
@@ -40,7 +40,7 @@ public interface AvroEndpointBuilder {
         }
         /**
          * Transport to use, can be either http or netty. The option is a
-         * org.apache.camel.component.avro.AvroTransport type.
+         * <code>org.apache.camel.component.avro.AvroTransport</code> type.
          */
         public T transport(AvroTransport transport) {
             this.properties.put("transport", transport);
@@ -48,43 +48,46 @@ public interface AvroEndpointBuilder {
         }
         /**
          * Transport to use, can be either http or netty. The option will be
-         * converted to a org.apache.camel.component.avro.AvroTransport type.
+         * converted to a
+         * <code>org.apache.camel.component.avro.AvroTransport</code> type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
             return (T) this;
         }
         /**
-         * Port number to use. The option is a int type.
+         * Port number to use. The option is a <code>int</code> type.
          */
         public T port(int port) {
             this.properties.put("port", port);
             return (T) this;
         }
         /**
-         * Port number to use. The option will be converted to a int type.
+         * Port number to use. The option will be converted to a
+         * <code>int</code> type.
          */
         public T port(String port) {
             this.properties.put("port", port);
             return (T) this;
         }
         /**
-         * Hostname to use. The option is a java.lang.String type.
+         * Hostname to use. The option is a <code>java.lang.String</code> type.
          */
         public T host(String host) {
             this.properties.put("host", host);
             return (T) this;
         }
         /**
-         * The name of the message to send. The option is a java.lang.String
-         * type.
+         * The name of the message to send. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T messageName(String messageName) {
             this.properties.put("messageName", messageName);
             return (T) this;
         }
         /**
-         * Avro protocol to use. The option is a org.apache.avro.Protocol type.
+         * Avro protocol to use. The option is a
+         * <code>org.apache.avro.Protocol</code> type.
          */
         public T protocol(Object protocol) {
             this.properties.put("protocol", protocol);
@@ -92,7 +95,7 @@ public interface AvroEndpointBuilder {
         }
         /**
          * Avro protocol to use. The option will be converted to a
-         * org.apache.avro.Protocol type.
+         * <code>org.apache.avro.Protocol</code> type.
          */
         public T protocol(String protocol) {
             this.properties.put("protocol", protocol);
@@ -100,14 +103,15 @@ public interface AvroEndpointBuilder {
         }
         /**
          * Avro protocol to use defined by the FQN class name. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T protocolClassName(String protocolClassName) {
             this.properties.put("protocolClassName", protocolClassName);
             return (T) this;
         }
         /**
-         * Avro protocol location. The option is a java.lang.String type.
+         * Avro protocol location. The option is a <code>java.lang.String</code>
+         * type.
          */
         public T protocolLocation(String protocolLocation) {
             this.properties.put("protocolLocation", protocolLocation);
@@ -116,7 +120,8 @@ public interface AvroEndpointBuilder {
         /**
          * If protocol object provided is reflection protocol. Should be used
          * only with protocol parameter because for protocolClassName protocol
-         * type will be auto detected. The option is a boolean type.
+         * type will be auto detected. The option is a <code>boolean</code>
+         * type.
          */
         public T reflectionProtocol(boolean reflectionProtocol) {
             this.properties.put("reflectionProtocol", reflectionProtocol);
@@ -125,8 +130,8 @@ public interface AvroEndpointBuilder {
         /**
          * If protocol object provided is reflection protocol. Should be used
          * only with protocol parameter because for protocolClassName protocol
-         * type will be auto detected. The option will be converted to a boolean
-         * type.
+         * type will be auto detected. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public T reflectionProtocol(String reflectionProtocol) {
             this.properties.put("reflectionProtocol", reflectionProtocol);
@@ -135,7 +140,7 @@ public interface AvroEndpointBuilder {
         /**
          * If true, consumer parameter won't be wrapped into array. Will fail if
          * protocol specifies more then 1 parameter for the message. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T singleParameter(boolean singleParameter) {
             this.properties.put("singleParameter", singleParameter);
@@ -144,7 +149,7 @@ public interface AvroEndpointBuilder {
         /**
          * If true, consumer parameter won't be wrapped into array. Will fail if
          * protocol specifies more then 1 parameter for the message. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T singleParameter(String singleParameter) {
             this.properties.put("singleParameter", singleParameter);
@@ -152,7 +157,7 @@ public interface AvroEndpointBuilder {
         }
         /**
          * Authority to use (username and password). The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T uriAuthority(String uriAuthority) {
             this.properties.put("uriAuthority", uriAuthority);
@@ -161,7 +166,7 @@ public interface AvroEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -170,7 +175,7 @@ public interface AvroEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -179,7 +184,7 @@ public interface AvroEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -188,7 +193,7 @@ public interface AvroEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -211,7 +216,7 @@ public interface AvroEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public AvroConsumerBuilder bridgeErrorHandler(boolean bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -224,7 +229,7 @@ public interface AvroEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public AvroConsumerBuilder bridgeErrorHandler(String bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -235,7 +240,7 @@ public interface AvroEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public AvroConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -247,7 +252,8 @@ public interface AvroEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public AvroConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -255,7 +261,7 @@ public interface AvroEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AvroConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -264,7 +270,8 @@ public interface AvroEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public AvroConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanEndpointBuilder.java
index 403af92..8f7de8e 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanEndpointBuilder.java
@@ -38,8 +38,8 @@ public interface BeanEndpointBuilder {
             super("bean", path);
         }
         /**
-         * Sets the name of the bean to invoke. The option is a java.lang.String
-         * type.
+         * Sets the name of the bean to invoke. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T beanName(String beanName) {
             this.properties.put("beanName", beanName);
@@ -47,7 +47,7 @@ public interface BeanEndpointBuilder {
         }
         /**
          * Sets the name of the method to invoke on the bean. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T method(String method) {
             this.properties.put("method", method);
@@ -56,7 +56,7 @@ public interface BeanEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -65,7 +65,7 @@ public interface BeanEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -74,7 +74,8 @@ public interface BeanEndpointBuilder {
         /**
          * If enabled, Camel will cache the result of the first Registry
          * look-up. Cache can be enabled if the bean in the Registry is defined
-         * as a singleton scope. The option is a java.lang.Boolean type.
+         * as a singleton scope. The option is a <code>java.lang.Boolean</code>
+         * type.
          */
         public T cache(Boolean cache) {
             this.properties.put("cache", cache);
@@ -84,7 +85,7 @@ public interface BeanEndpointBuilder {
          * If enabled, Camel will cache the result of the first Registry
          * look-up. Cache can be enabled if the bean in the Registry is defined
          * as a singleton scope. The option will be converted to a
-         * java.lang.Boolean type.
+         * <code>java.lang.Boolean</code> type.
          */
         public T cache(String cache) {
             this.properties.put("cache", cache);
@@ -92,7 +93,8 @@ public interface BeanEndpointBuilder {
         }
         /**
          * Used for configuring additional properties on the bean. The option is
-         * a java.util.Map<java.lang.String,java.lang.Object> type.
+         * a <code>java.util.Map<java.lang.String, java.lang.Object></code>
+         * type.
          */
         public T parameters(Map<String, Object> parameters) {
             this.properties.put("parameters", parameters);
@@ -100,8 +102,8 @@ public interface BeanEndpointBuilder {
         }
         /**
          * Used for configuring additional properties on the bean. The option
-         * will be converted to a
-         * java.util.Map<java.lang.String,java.lang.Object> type.
+         * will be converted to a <code>java.util.Map<java.lang.String,
+         * java.lang.Object></code> type.
          */
         public T parameters(String parameters) {
             this.properties.put("parameters", parameters);
@@ -110,7 +112,7 @@ public interface BeanEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -119,7 +121,7 @@ public interface BeanEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanValidatorEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanValidatorEndpointBuilder.java
index 53d756a..35f25d4 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanValidatorEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanValidatorEndpointBuilder.java
@@ -39,7 +39,7 @@ public interface BeanValidatorEndpointBuilder {
         }
         /**
          * Where label is an arbitrary text value describing the endpoint. The
-         * option is a java.lang.String type.
+         * option is a <code>java.lang.String</code> type.
          */
         public T label(String label) {
             this.properties.put("label", label);
@@ -47,7 +47,7 @@ public interface BeanValidatorEndpointBuilder {
         }
         /**
          * To use a custom ConstraintValidatorFactory. The option is a
-         * javax.validation.ConstraintValidatorFactory type.
+         * <code>javax.validation.ConstraintValidatorFactory</code> type.
          */
         public T constraintValidatorFactory(Object constraintValidatorFactory) {
             this.properties.put("constraintValidatorFactory", constraintValidatorFactory);
@@ -55,15 +55,16 @@ public interface BeanValidatorEndpointBuilder {
         }
         /**
          * To use a custom ConstraintValidatorFactory. The option will be
-         * converted to a javax.validation.ConstraintValidatorFactory type.
+         * converted to a
+         * <code>javax.validation.ConstraintValidatorFactory</code> type.
          */
         public T constraintValidatorFactory(String constraintValidatorFactory) {
             this.properties.put("constraintValidatorFactory", constraintValidatorFactory);
             return (T) this;
         }
         /**
-         * To use a custom validation group. The option is a java.lang.String
-         * type.
+         * To use a custom validation group. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T group(String group) {
             this.properties.put("group", group);
@@ -71,7 +72,7 @@ public interface BeanValidatorEndpointBuilder {
         }
         /**
          * To use a custom MessageInterpolator. The option is a
-         * javax.validation.MessageInterpolator type.
+         * <code>javax.validation.MessageInterpolator</code> type.
          */
         public T messageInterpolator(Object messageInterpolator) {
             this.properties.put("messageInterpolator", messageInterpolator);
@@ -79,7 +80,7 @@ public interface BeanValidatorEndpointBuilder {
         }
         /**
          * To use a custom MessageInterpolator. The option will be converted to
-         * a javax.validation.MessageInterpolator type.
+         * a <code>javax.validation.MessageInterpolator</code> type.
          */
         public T messageInterpolator(String messageInterpolator) {
             this.properties.put("messageInterpolator", messageInterpolator);
@@ -87,7 +88,7 @@ public interface BeanValidatorEndpointBuilder {
         }
         /**
          * To use a custom TraversableResolver. The option is a
-         * javax.validation.TraversableResolver type.
+         * <code>javax.validation.TraversableResolver</code> type.
          */
         public T traversableResolver(Object traversableResolver) {
             this.properties.put("traversableResolver", traversableResolver);
@@ -95,7 +96,7 @@ public interface BeanValidatorEndpointBuilder {
         }
         /**
          * To use a custom TraversableResolver. The option will be converted to
-         * a javax.validation.TraversableResolver type.
+         * a <code>javax.validation.TraversableResolver</code> type.
          */
         public T traversableResolver(String traversableResolver) {
             this.properties.put("traversableResolver", traversableResolver);
@@ -103,7 +104,7 @@ public interface BeanValidatorEndpointBuilder {
         }
         /**
          * To use a a custom ValidationProviderResolver. The option is a
-         * javax.validation.ValidationProviderResolver type.
+         * <code>javax.validation.ValidationProviderResolver</code> type.
          */
         public T validationProviderResolver(Object validationProviderResolver) {
             this.properties.put("validationProviderResolver", validationProviderResolver);
@@ -111,7 +112,8 @@ public interface BeanValidatorEndpointBuilder {
         }
         /**
          * To use a a custom ValidationProviderResolver. The option will be
-         * converted to a javax.validation.ValidationProviderResolver type.
+         * converted to a
+         * <code>javax.validation.ValidationProviderResolver</code> type.
          */
         public T validationProviderResolver(String validationProviderResolver) {
             this.properties.put("validationProviderResolver", validationProviderResolver);
@@ -120,7 +122,7 @@ public interface BeanValidatorEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -129,7 +131,7 @@ public interface BeanValidatorEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -138,7 +140,7 @@ public interface BeanValidatorEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -147,7 +149,7 @@ public interface BeanValidatorEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanstalkEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanstalkEndpointBuilder.java
index 90dfe0f..1a105c2 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanstalkEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanstalkEndpointBuilder.java
@@ -46,8 +46,8 @@ public interface BeanstalkEndpointBuilder {
             super("beanstalk", path);
         }
         /**
-         * Connection settings host:port/tube. The option is a java.lang.String
-         * type.
+         * Connection settings host:port/tube. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T connectionSettings(String connectionSettings) {
             this.properties.put("connectionSettings", connectionSettings);
@@ -61,7 +61,8 @@ public interface BeanstalkEndpointBuilder {
          * in beanstalk.result message header kick expects the number of jobs to
          * kick in the message body and returns the number of jobs actually
          * kicked out in the message header beanstalk.result. The option is a
-         * org.apache.camel.component.beanstalk.BeanstalkCommand type.
+         * <code>org.apache.camel.component.beanstalk.BeanstalkCommand</code>
+         * type.
          */
         public T command(BeanstalkCommand command) {
             this.properties.put("command", command);
@@ -75,7 +76,8 @@ public interface BeanstalkEndpointBuilder {
          * in beanstalk.result message header kick expects the number of jobs to
          * kick in the message body and returns the number of jobs actually
          * kicked out in the message header beanstalk.result. The option will be
-         * converted to a org.apache.camel.component.beanstalk.BeanstalkCommand
+         * converted to a
+         * <code>org.apache.camel.component.beanstalk.BeanstalkCommand</code>
          * type.
          */
         public T command(String command) {
@@ -83,14 +85,15 @@ public interface BeanstalkEndpointBuilder {
             return (T) this;
         }
         /**
-         * Job delay in seconds. The option is a int type.
+         * Job delay in seconds. The option is a <code>int</code> type.
          */
         public T jobDelay(int jobDelay) {
             this.properties.put("jobDelay", jobDelay);
             return (T) this;
         }
         /**
-         * Job delay in seconds. The option will be converted to a int type.
+         * Job delay in seconds. The option will be converted to a
+         * <code>int</code> type.
          */
         public T jobDelay(String jobDelay) {
             this.properties.put("jobDelay", jobDelay);
@@ -98,7 +101,7 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Job priority. (0 is the highest, see Beanstalk protocol). The option
-         * is a long type.
+         * is a <code>long</code> type.
          */
         public T jobPriority(long jobPriority) {
             this.properties.put("jobPriority", jobPriority);
@@ -106,7 +109,7 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Job priority. (0 is the highest, see Beanstalk protocol). The option
-         * will be converted to a long type.
+         * will be converted to a <code>long</code> type.
          */
         public T jobPriority(String jobPriority) {
             this.properties.put("jobPriority", jobPriority);
@@ -114,8 +117,8 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Job time to run in seconds. (when 0, the beanstalkd daemon raises it
-         * to 1 automatically, see Beanstalk protocol). The option is a int
-         * type.
+         * to 1 automatically, see Beanstalk protocol). The option is a
+         * <code>int</code> type.
          */
         public T jobTimeToRun(int jobTimeToRun) {
             this.properties.put("jobTimeToRun", jobTimeToRun);
@@ -124,7 +127,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * Job time to run in seconds. (when 0, the beanstalkd daemon raises it
          * to 1 automatically, see Beanstalk protocol). The option will be
-         * converted to a int type.
+         * converted to a <code>int</code> type.
          */
         public T jobTimeToRun(String jobTimeToRun) {
             this.properties.put("jobTimeToRun", jobTimeToRun);
@@ -133,7 +136,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -142,7 +145,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -151,7 +154,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -160,7 +163,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -178,7 +181,7 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Whether to wait for job to complete before ack the job from
-         * beanstalk. The option is a boolean type.
+         * beanstalk. The option is a <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder awaitJob(boolean awaitJob) {
             this.properties.put("awaitJob", awaitJob);
@@ -186,7 +189,8 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Whether to wait for job to complete before ack the job from
-         * beanstalk. The option will be converted to a boolean type.
+         * beanstalk. The option will be converted to a <code>boolean</code>
+         * type.
          */
         public BeanstalkConsumerBuilder awaitJob(String awaitJob) {
             this.properties.put("awaitJob", awaitJob);
@@ -199,7 +203,7 @@ public interface BeanstalkEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -213,7 +217,7 @@ public interface BeanstalkEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -222,7 +226,8 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Command to use when processing failed. The option is a
-         * org.apache.camel.component.beanstalk.BeanstalkCommand type.
+         * <code>org.apache.camel.component.beanstalk.BeanstalkCommand</code>
+         * type.
          */
         public BeanstalkConsumerBuilder onFailure(BeanstalkCommand onFailure) {
             this.properties.put("onFailure", onFailure);
@@ -230,7 +235,9 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Command to use when processing failed. The option will be converted
-         * to a org.apache.camel.component.beanstalk.BeanstalkCommand type.
+         * to a
+         * <code>org.apache.camel.component.beanstalk.BeanstalkCommand</code>
+         * type.
          */
         public BeanstalkConsumerBuilder onFailure(String onFailure) {
             this.properties.put("onFailure", onFailure);
@@ -239,7 +246,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * If the polling consumer did not poll any files, you can enable this
          * option to send an empty message (no body) instead. The option is a
-         * boolean type.
+         * <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder sendEmptyMessageWhenIdle(
                 boolean sendEmptyMessageWhenIdle) {
@@ -249,7 +256,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * If the polling consumer did not poll any files, you can enable this
          * option to send an empty message (no body) instead. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder sendEmptyMessageWhenIdle(
                 String sendEmptyMessageWhenIdle) {
@@ -257,15 +264,15 @@ public interface BeanstalkEndpointBuilder {
             return (BeanstalkConsumerBuilder) this;
         }
         /**
-         * Whether to use blockIO. The option is a boolean type.
+         * Whether to use blockIO. The option is a <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder useBlockIO(boolean useBlockIO) {
             this.properties.put("useBlockIO", useBlockIO);
             return (BeanstalkConsumerBuilder) this;
         }
         /**
-         * Whether to use blockIO. The option will be converted to a boolean
-         * type.
+         * Whether to use blockIO. The option will be converted to a
+         * <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder useBlockIO(String useBlockIO) {
             this.properties.put("useBlockIO", useBlockIO);
@@ -276,7 +283,7 @@ public interface BeanstalkEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public BeanstalkConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -288,7 +295,8 @@ public interface BeanstalkEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public BeanstalkConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -296,7 +304,7 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public BeanstalkConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -305,7 +313,8 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public BeanstalkConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
@@ -316,7 +325,7 @@ public interface BeanstalkEndpointBuilder {
          * you to provide your custom implementation to control error handling
          * usually occurred during the poll operation before an Exchange have
          * been created and being routed in Camel. The option is a
-         * org.apache.camel.spi.PollingConsumerPollStrategy type.
+         * <code>org.apache.camel.spi.PollingConsumerPollStrategy</code> type.
          */
         public BeanstalkConsumerBuilder pollStrategy(
                 PollingConsumerPollStrategy pollStrategy) {
@@ -328,7 +337,8 @@ public interface BeanstalkEndpointBuilder {
          * you to provide your custom implementation to control error handling
          * usually occurred during the poll operation before an Exchange have
          * been created and being routed in Camel. The option will be converted
-         * to a org.apache.camel.spi.PollingConsumerPollStrategy type.
+         * to a <code>org.apache.camel.spi.PollingConsumerPollStrategy</code>
+         * type.
          */
         public BeanstalkConsumerBuilder pollStrategy(String pollStrategy) {
             this.properties.put("pollStrategy", pollStrategy);
@@ -337,7 +347,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in. The option
-         * is a int type.
+         * is a <code>int</code> type.
          */
         public BeanstalkConsumerBuilder backoffErrorThreshold(
                 int backoffErrorThreshold) {
@@ -347,7 +357,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in. The option
-         * will be converted to a int type.
+         * will be converted to a <code>int</code> type.
          */
         public BeanstalkConsumerBuilder backoffErrorThreshold(
                 String backoffErrorThreshold) {
@@ -356,7 +366,8 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * The number of subsequent idle polls that should happen before the
-         * backoffMultipler should kick-in. The option is a int type.
+         * backoffMultipler should kick-in. The option is a <code>int</code>
+         * type.
          */
         public BeanstalkConsumerBuilder backoffIdleThreshold(
                 int backoffIdleThreshold) {
@@ -366,7 +377,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * The number of subsequent idle polls that should happen before the
          * backoffMultipler should kick-in. The option will be converted to a
-         * int type.
+         * <code>int</code> type.
          */
         public BeanstalkConsumerBuilder backoffIdleThreshold(
                 String backoffIdleThreshold) {
@@ -379,7 +390,7 @@ public interface BeanstalkEndpointBuilder {
          * the number of polls that will be skipped before the next actual
          * attempt is happening again. When this option is in use then
          * backoffIdleThreshold and/or backoffErrorThreshold must also be
-         * configured. The option is a int type.
+         * configured. The option is a <code>int</code> type.
          */
         public BeanstalkConsumerBuilder backoffMultiplier(int backoffMultiplier) {
             this.properties.put("backoffMultiplier", backoffMultiplier);
@@ -391,7 +402,7 @@ public interface BeanstalkEndpointBuilder {
          * the number of polls that will be skipped before the next actual
          * attempt is happening again. When this option is in use then
          * backoffIdleThreshold and/or backoffErrorThreshold must also be
-         * configured. The option will be converted to a int type.
+         * configured. The option will be converted to a <code>int</code> type.
          */
         public BeanstalkConsumerBuilder backoffMultiplier(
                 String backoffMultiplier) {
@@ -401,7 +412,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * Milliseconds before the next poll. You can also specify time values
          * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option is a long type.
+         * seconds), and 1h (1 hour). The option is a <code>long</code> type.
          */
         public BeanstalkConsumerBuilder delay(long delay) {
             this.properties.put("delay", delay);
@@ -410,8 +421,8 @@ public interface BeanstalkEndpointBuilder {
         /**
          * Milliseconds before the next poll. You can also specify time values
          * using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option will be converted to a long
-         * type.
+         * seconds), and 1h (1 hour). The option will be converted to a
+         * <code>long</code> type.
          */
         public BeanstalkConsumerBuilder delay(String delay) {
             this.properties.put("delay", delay);
@@ -420,7 +431,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * If greedy is enabled, then the ScheduledPollConsumer will run
          * immediately again, if the previous run polled 1 or more messages. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder greedy(boolean greedy) {
             this.properties.put("greedy", greedy);
@@ -429,7 +440,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * If greedy is enabled, then the ScheduledPollConsumer will run
          * immediately again, if the previous run polled 1 or more messages. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder greedy(String greedy) {
             this.properties.put("greedy", greedy);
@@ -438,7 +449,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * Milliseconds before the first poll starts. You can also specify time
          * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option is a long type.
+         * seconds), and 1h (1 hour). The option is a <code>long</code> type.
          */
         public BeanstalkConsumerBuilder initialDelay(long initialDelay) {
             this.properties.put("initialDelay", initialDelay);
@@ -447,8 +458,8 @@ public interface BeanstalkEndpointBuilder {
         /**
          * Milliseconds before the first poll starts. You can also specify time
          * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour). The option will be converted to a long
-         * type.
+         * seconds), and 1h (1 hour). The option will be converted to a
+         * <code>long</code> type.
          */
         public BeanstalkConsumerBuilder initialDelay(String initialDelay) {
             this.properties.put("initialDelay", initialDelay);
@@ -457,7 +468,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * The consumer logs a start/complete log line when it polls. This
          * option allows you to configure the logging level for that. The option
-         * is a org.apache.camel.LoggingLevel type.
+         * is a <code>org.apache.camel.LoggingLevel</code> type.
          */
         public BeanstalkConsumerBuilder runLoggingLevel(
                 LoggingLevel runLoggingLevel) {
@@ -467,7 +478,8 @@ public interface BeanstalkEndpointBuilder {
         /**
          * The consumer logs a start/complete log line when it polls. This
          * option allows you to configure the logging level for that. The option
-         * will be converted to a org.apache.camel.LoggingLevel type.
+         * will be converted to a <code>org.apache.camel.LoggingLevel</code>
+         * type.
          */
         public BeanstalkConsumerBuilder runLoggingLevel(String runLoggingLevel) {
             this.properties.put("runLoggingLevel", runLoggingLevel);
@@ -476,8 +488,8 @@ public interface BeanstalkEndpointBuilder {
         /**
          * Allows for configuring a custom/shared thread pool to use for the
          * consumer. By default each consumer has its own single threaded thread
-         * pool. The option is a java.util.concurrent.ScheduledExecutorService
-         * type.
+         * pool. The option is a
+         * <code>java.util.concurrent.ScheduledExecutorService</code> type.
          */
         public BeanstalkConsumerBuilder scheduledExecutorService(
                 ScheduledExecutorService scheduledExecutorService) {
@@ -488,7 +500,7 @@ public interface BeanstalkEndpointBuilder {
          * Allows for configuring a custom/shared thread pool to use for the
          * consumer. By default each consumer has its own single threaded thread
          * pool. The option will be converted to a
-         * java.util.concurrent.ScheduledExecutorService type.
+         * <code>java.util.concurrent.ScheduledExecutorService</code> type.
          */
         public BeanstalkConsumerBuilder scheduledExecutorService(
                 String scheduledExecutorService) {
@@ -498,7 +510,8 @@ public interface BeanstalkEndpointBuilder {
         /**
          * To use a cron scheduler from either camel-spring or camel-quartz2
          * component. The option is a
-         * org.apache.camel.spi.ScheduledPollConsumerScheduler type.
+         * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code>
+         * type.
          */
         public BeanstalkConsumerBuilder scheduler(
                 ScheduledPollConsumerScheduler scheduler) {
@@ -508,7 +521,8 @@ public interface BeanstalkEndpointBuilder {
         /**
          * To use a cron scheduler from either camel-spring or camel-quartz2
          * component. The option will be converted to a
-         * org.apache.camel.spi.ScheduledPollConsumerScheduler type.
+         * <code>org.apache.camel.spi.ScheduledPollConsumerScheduler</code>
+         * type.
          */
         public BeanstalkConsumerBuilder scheduler(String scheduler) {
             this.properties.put("scheduler", scheduler);
@@ -517,7 +531,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * java.util.Map<java.lang.String,java.lang.Object> type.
+         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
          */
         public BeanstalkConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -527,7 +541,8 @@ public interface BeanstalkEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a java.util.Map<java.lang.String,java.lang.Object> type.
+         * converted to a <code>java.util.Map<java.lang.String,
+         * java.lang.Object></code> type.
          */
         public BeanstalkConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
@@ -535,8 +550,8 @@ public interface BeanstalkEndpointBuilder {
             return (BeanstalkConsumerBuilder) this;
         }
         /**
-         * Whether the scheduler should be auto started. The option is a boolean
-         * type.
+         * Whether the scheduler should be auto started. The option is a
+         * <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder startScheduler(boolean startScheduler) {
             this.properties.put("startScheduler", startScheduler);
@@ -544,7 +559,7 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Whether the scheduler should be auto started. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder startScheduler(String startScheduler) {
             this.properties.put("startScheduler", startScheduler);
@@ -552,7 +567,7 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Time unit for initialDelay and delay options. The option is a
-         * java.util.concurrent.TimeUnit type.
+         * <code>java.util.concurrent.TimeUnit</code> type.
          */
         public BeanstalkConsumerBuilder timeUnit(TimeUnit timeUnit) {
             this.properties.put("timeUnit", timeUnit);
@@ -560,7 +575,7 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Time unit for initialDelay and delay options. The option will be
-         * converted to a java.util.concurrent.TimeUnit type.
+         * converted to a <code>java.util.concurrent.TimeUnit</code> type.
          */
         public BeanstalkConsumerBuilder timeUnit(String timeUnit) {
             this.properties.put("timeUnit", timeUnit);
@@ -568,8 +583,8 @@ public interface BeanstalkEndpointBuilder {
         }
         /**
          * Controls if fixed delay or fixed rate is used. See
-         * ScheduledExecutorService in JDK for details. The option is a boolean
-         * type.
+         * ScheduledExecutorService in JDK for details. The option is a
+         * <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder useFixedDelay(boolean useFixedDelay) {
             this.properties.put("useFixedDelay", useFixedDelay);
@@ -578,7 +593,7 @@ public interface BeanstalkEndpointBuilder {
         /**
          * Controls if fixed delay or fixed rate is used. See
          * ScheduledExecutorService in JDK for details. The option will be
-         * converted to a boolean type.
+         * converted to a <code>boolean</code> type.
          */
         public BeanstalkConsumerBuilder useFixedDelay(String useFixedDelay) {
             this.properties.put("useFixedDelay", useFixedDelay);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BlobServiceEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BlobServiceEndpointBuilder.java
index 257226b..fda407a 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BlobServiceEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BlobServiceEndpointBuilder.java
@@ -41,7 +41,8 @@ public interface BlobServiceEndpointBuilder {
             super("azure-blob", path);
         }
         /**
-         * Container or Blob compact Uri. The option is a java.lang.String type.
+         * Container or Blob compact Uri. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T containerOrBlobUri(String containerOrBlobUri) {
             this.properties.put("containerOrBlobUri", containerOrBlobUri);
@@ -49,7 +50,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * The blob service client. The option is a
-         * com.microsoft.azure.storage.blob.CloudBlob type.
+         * <code>com.microsoft.azure.storage.blob.CloudBlob</code> type.
          */
         public T azureBlobClient(Object azureBlobClient) {
             this.properties.put("azureBlobClient", azureBlobClient);
@@ -57,7 +58,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * The blob service client. The option will be converted to a
-         * com.microsoft.azure.storage.blob.CloudBlob type.
+         * <code>com.microsoft.azure.storage.blob.CloudBlob</code> type.
          */
         public T azureBlobClient(String azureBlobClient) {
             this.properties.put("azureBlobClient", azureBlobClient);
@@ -65,7 +66,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the blob offset for the upload or download operations, default is
-         * 0. The option is a java.lang.Long type.
+         * 0. The option is a <code>java.lang.Long</code> type.
          */
         public T blobOffset(Long blobOffset) {
             this.properties.put("blobOffset", blobOffset);
@@ -73,7 +74,8 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the blob offset for the upload or download operations, default is
-         * 0. The option will be converted to a java.lang.Long type.
+         * 0. The option will be converted to a <code>java.lang.Long</code>
+         * type.
          */
         public T blobOffset(String blobOffset) {
             this.properties.put("blobOffset", blobOffset);
@@ -81,7 +83,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set a blob type, 'blockblob' is default. The option is a
-         * org.apache.camel.component.azure.blob.BlobType type.
+         * <code>org.apache.camel.component.azure.blob.BlobType</code> type.
          */
         public T blobType(BlobType blobType) {
             this.properties.put("blobType", blobType);
@@ -89,7 +91,8 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set a blob type, 'blockblob' is default. The option will be converted
-         * to a org.apache.camel.component.azure.blob.BlobType type.
+         * to a <code>org.apache.camel.component.azure.blob.BlobType</code>
+         * type.
          */
         public T blobType(String blobType) {
             this.properties.put("blobType", blobType);
@@ -97,7 +100,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Close the stream after read or keep it open, default is true. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public T closeStreamAfterRead(boolean closeStreamAfterRead) {
             this.properties.put("closeStreamAfterRead", closeStreamAfterRead);
@@ -105,7 +108,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Close the stream after read or keep it open, default is true. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public T closeStreamAfterRead(String closeStreamAfterRead) {
             this.properties.put("closeStreamAfterRead", closeStreamAfterRead);
@@ -113,7 +116,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the storage credentials, required in most cases. The option is a
-         * com.microsoft.azure.storage.StorageCredentials type.
+         * <code>com.microsoft.azure.storage.StorageCredentials</code> type.
          */
         public T credentials(Object credentials) {
             this.properties.put("credentials", credentials);
@@ -121,8 +124,8 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the storage credentials, required in most cases. The option will
-         * be converted to a com.microsoft.azure.storage.StorageCredentials
-         * type.
+         * be converted to a
+         * <code>com.microsoft.azure.storage.StorageCredentials</code> type.
          */
         public T credentials(String credentials) {
             this.properties.put("credentials", credentials);
@@ -130,7 +133,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the data length for the download or page blob upload operations.
-         * The option is a java.lang.Long type.
+         * The option is a <code>java.lang.Long</code> type.
          */
         public T dataLength(Long dataLength) {
             this.properties.put("dataLength", dataLength);
@@ -138,7 +141,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the data length for the download or page blob upload operations.
-         * The option will be converted to a java.lang.Long type.
+         * The option will be converted to a <code>java.lang.Long</code> type.
          */
         public T dataLength(String dataLength) {
             this.properties.put("dataLength", dataLength);
@@ -146,7 +149,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the file directory where the downloaded blobs will be saved to.
-         * The option is a java.lang.String type.
+         * The option is a <code>java.lang.String</code> type.
          */
         public T fileDir(String fileDir) {
             this.properties.put("fileDir", fileDir);
@@ -155,7 +158,7 @@ public interface BlobServiceEndpointBuilder {
         /**
          * Storage resources can be public for reading their content, if this
          * property is enabled then the credentials do not have to be set. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public T publicForRead(boolean publicForRead) {
             this.properties.put("publicForRead", publicForRead);
@@ -164,7 +167,7 @@ public interface BlobServiceEndpointBuilder {
         /**
          * Storage resources can be public for reading their content, if this
          * property is enabled then the credentials do not have to be set. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public T publicForRead(String publicForRead) {
             this.properties.put("publicForRead", publicForRead);
@@ -172,7 +175,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the minimum read size in bytes when reading the blob content. The
-         * option is a int type.
+         * option is a <code>int</code> type.
          */
         public T streamReadSize(int streamReadSize) {
             this.properties.put("streamReadSize", streamReadSize);
@@ -180,7 +183,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the minimum read size in bytes when reading the blob content. The
-         * option will be converted to a int type.
+         * option will be converted to a <code>int</code> type.
          */
         public T streamReadSize(String streamReadSize) {
             this.properties.put("streamReadSize", streamReadSize);
@@ -189,7 +192,7 @@ public interface BlobServiceEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -198,7 +201,7 @@ public interface BlobServiceEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -207,7 +210,7 @@ public interface BlobServiceEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -216,7 +219,7 @@ public interface BlobServiceEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -239,7 +242,7 @@ public interface BlobServiceEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public BlobServiceConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -253,7 +256,7 @@ public interface BlobServiceEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public BlobServiceConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -265,7 +268,7 @@ public interface BlobServiceEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public BlobServiceConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -277,7 +280,8 @@ public interface BlobServiceEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public BlobServiceConsumerBuilder exceptionHandler(
                 String exceptionHandler) {
@@ -286,7 +290,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public BlobServiceConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -295,7 +299,8 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public BlobServiceConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
@@ -313,7 +318,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the blob meta-data. The option is a
-         * java.util.Map<java.lang.String,java.lang.String> type.
+         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
          */
         public BlobServiceProducerBuilder blobMetadata(
                 Map<String, String> blobMetadata) {
@@ -322,7 +327,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the blob meta-data. The option will be converted to a
-         * java.util.Map<java.lang.String,java.lang.String> type.
+         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
          */
         public BlobServiceProducerBuilder blobMetadata(String blobMetadata) {
             this.properties.put("blobMetadata", blobMetadata);
@@ -330,7 +335,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set a prefix which can be used for listing the blobs. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public BlobServiceProducerBuilder blobPrefix(String blobPrefix) {
             this.properties.put("blobPrefix", blobPrefix);
@@ -338,7 +343,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Close the stream after write or keep it open, default is true. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public BlobServiceProducerBuilder closeStreamAfterWrite(
                 boolean closeStreamAfterWrite) {
@@ -347,7 +352,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Close the stream after write or keep it open, default is true. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public BlobServiceProducerBuilder closeStreamAfterWrite(
                 String closeStreamAfterWrite) {
@@ -356,7 +361,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Blob service operation hint to the producer. The option is a
-         * org.apache.camel.component.azure.blob.BlobServiceOperations type.
+         * <code>org.apache.camel.component.azure.blob.BlobServiceOperations</code> type.
          */
         public BlobServiceProducerBuilder operation(
                 BlobServiceOperations operation) {
@@ -366,7 +371,7 @@ public interface BlobServiceEndpointBuilder {
         /**
          * Blob service operation hint to the producer. The option will be
          * converted to a
-         * org.apache.camel.component.azure.blob.BlobServiceOperations type.
+         * <code>org.apache.camel.component.azure.blob.BlobServiceOperations</code> type.
          */
         public BlobServiceProducerBuilder operation(String operation) {
             this.properties.put("operation", operation);
@@ -374,7 +379,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the size of the buffer for writing block and page blocks. The
-         * option is a int type.
+         * option is a <code>int</code> type.
          */
         public BlobServiceProducerBuilder streamWriteSize(int streamWriteSize) {
             this.properties.put("streamWriteSize", streamWriteSize);
@@ -382,7 +387,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the size of the buffer for writing block and page blocks. The
-         * option will be converted to a int type.
+         * option will be converted to a <code>int</code> type.
          */
         public BlobServiceProducerBuilder streamWriteSize(String streamWriteSize) {
             this.properties.put("streamWriteSize", streamWriteSize);
@@ -390,7 +395,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Specify if the flat or hierarchical blob listing should be used. The
-         * option is a boolean type.
+         * option is a <code>boolean</code> type.
          */
         public BlobServiceProducerBuilder useFlatListing(boolean useFlatListing) {
             this.properties.put("useFlatListing", useFlatListing);
@@ -398,7 +403,7 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Specify if the flat or hierarchical blob listing should be used. The
-         * option will be converted to a boolean type.
+         * option will be converted to a <code>boolean</code> type.
          */
         public BlobServiceProducerBuilder useFlatListing(String useFlatListing) {
             this.properties.put("useFlatListing", useFlatListing);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BonitaEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BonitaEndpointBuilder.java
index 678a1b4e..bbd85a1 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BonitaEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BonitaEndpointBuilder.java
@@ -40,7 +40,8 @@ public interface BonitaEndpointBuilder {
         }
         /**
          * Operation to use. The option is a
-         * org.apache.camel.component.bonita.util.BonitaOperation type.
+         * <code>org.apache.camel.component.bonita.util.BonitaOperation</code>
+         * type.
          */
         public T operation(BonitaOperation operation) {
             this.properties.put("operation", operation);
@@ -48,15 +49,16 @@ public interface BonitaEndpointBuilder {
         }
         /**
          * Operation to use. The option will be converted to a
-         * org.apache.camel.component.bonita.util.BonitaOperation type.
+         * <code>org.apache.camel.component.bonita.util.BonitaOperation</code>
+         * type.
          */
         public T operation(String operation) {
             this.properties.put("operation", operation);
             return (T) this;
         }
         /**
-         * Hostname where Bonita engine runs. The option is a java.lang.String
-         * type.
+         * Hostname where Bonita engine runs. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T hostname(String hostname) {
             this.properties.put("hostname", hostname);
@@ -64,7 +66,7 @@ public interface BonitaEndpointBuilder {
         }
         /**
          * Port of the server hosting Bonita engine. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T port(String port) {
             this.properties.put("port", port);
@@ -72,7 +74,7 @@ public interface BonitaEndpointBuilder {
         }
         /**
          * Name of the process involved in the operation. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T processName(String processName) {
             this.properties.put("processName", processName);
@@ -81,7 +83,7 @@ public interface BonitaEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -90,7 +92,7 @@ public interface BonitaEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -99,7 +101,7 @@ public interface BonitaEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -108,7 +110,7 @@ public interface BonitaEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -116,7 +118,7 @@ public interface BonitaEndpointBuilder {
         }
         /**
          * Password to authenticate to Bonita engine. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T password(String password) {
             this.properties.put("password", password);
@@ -124,7 +126,7 @@ public interface BonitaEndpointBuilder {
         }
         /**
          * Username to authenticate to Bonita engine. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T username(String username) {
             this.properties.put("username", username);
@@ -147,7 +149,7 @@ public interface BonitaEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public BonitaConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
@@ -161,7 +163,7 @@ public interface BonitaEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public BonitaConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
@@ -173,7 +175,7 @@ public interface BonitaEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public BonitaConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -185,7 +187,8 @@ public interface BonitaEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public BonitaConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -193,7 +196,7 @@ public interface BonitaEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public BonitaConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -202,7 +205,8 @@ public interface BonitaEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public BonitaConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BoxEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BoxEndpointBuilder.java
index 1322227..eae5e9d 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BoxEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BoxEndpointBuilder.java
@@ -42,7 +42,7 @@ public interface BoxEndpointBuilder {
         }
         /**
          * What kind of operation to perform. The option is a
-         * org.apache.camel.component.box.internal.BoxApiName type.
+         * <code>org.apache.camel.component.box.internal.BoxApiName</code> type.
          */
         public T apiName(BoxApiName apiName) {
             this.properties.put("apiName", apiName);
@@ -50,7 +50,7 @@ public interface BoxEndpointBuilder {
         }
         /**
          * What kind of operation to perform. The option will be converted to a
-         * org.apache.camel.component.box.internal.BoxApiName type.
+         * <code>org.apache.camel.component.box.internal.BoxApiName</code> type.
          */
         public T apiName(String apiName) {
             this.properties.put("apiName", apiName);
@@ -58,14 +58,15 @@ public interface BoxEndpointBuilder {
         }
         /**
          * What sub operation to use for the selected operation. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T methodName(String methodName) {
             this.properties.put("methodName", methodName);
             return (T) this;
         }
         /**
-         * Box application client ID. The option is a java.lang.String type.
+         * Box application client ID. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T clientId(String clientId) {
             this.properties.put("clientId", clientId);
@@ -73,7 +74,7 @@ public interface BoxEndpointBuilder {
         }
         /**
          * The enterprise ID to use for an App Enterprise. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T enterpriseId(String enterpriseId) {
             this.properties.put("enterpriseId", enterpriseId);
@@ -81,15 +82,15 @@ public interface BoxEndpointBuilder {
         }
         /**
          * Sets the name of a parameter to be passed in the exchange In Body.
-         * The option is a java.lang.String type.
+         * The option is a <code>java.lang.String</code> type.
          */
         public T inBody(String inBody) {
             this.properties.put("inBody", inBody);
             return (T) this;
         }
         /**
-         * The user ID to use for an App User. The option is a java.lang.String
-         * type.
+         * The user ID to use for an App User. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T userId(String userId) {
             this.properties.put("userId", userId);
@@ -98,7 +99,7 @@ public interface BoxEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T basicPropertyBinding(boolean basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -107,7 +108,7 @@ public interface BoxEndpointBuilder {
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities. The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T basicPropertyBinding(String basicPropertyBinding) {
             this.properties.put("basicPropertyBinding", basicPropertyBinding);
@@ -115,7 +116,7 @@ public interface BoxEndpointBuilder {
         }
         /**
          * Custom HTTP params for settings like proxy host. The option is a
-         * java.util.Map<java.lang.String,java.lang.Object> type.
+         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
          */
         public T httpParams(Map<String, Object> httpParams) {
             this.properties.put("httpParams", httpParams);
@@ -123,7 +124,8 @@ public interface BoxEndpointBuilder {
         }
         /**
          * Custom HTTP params for settings like proxy host. The option will be
-         * converted to a java.util.Map<java.lang.String,java.lang.Object> type.
+         * converted to a <code>java.util.Map<java.lang.String,
+         * java.lang.Object></code> type.
          */
         public T httpParams(String httpParams) {
             this.properties.put("httpParams", httpParams);
@@ -132,7 +134,7 @@ public interface BoxEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * is a boolean type.
+         * is a <code>boolean</code> type.
          */
         public T synchronous(boolean synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -141,7 +143,7 @@ public interface BoxEndpointBuilder {
         /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported). The option
-         * will be converted to a boolean type.
+         * will be converted to a <code>boolean</code> type.
          */
         public T synchronous(String synchronous) {
             this.properties.put("synchronous", synchronous);
@@ -149,7 +151,7 @@ public interface BoxEndpointBuilder {
         }
         /**
          * Custom Access Token Cache for storing and retrieving access tokens.
-         * The option is a com.box.sdk.IAccessTokenCache type.
+         * The option is a <code>com.box.sdk.IAccessTokenCache</code> type.
          */
         public T accessTokenCache(Object accessTokenCache) {
             this.properties.put("accessTokenCache", accessTokenCache);
@@ -157,14 +159,16 @@ public interface BoxEndpointBuilder {
         }
         /**
          * Custom Access Token Cache for storing and retrieving access tokens.
-         * The option will be converted to a com.box.sdk.IAccessTokenCache type.
+         * The option will be converted to a
+         * <code>com.box.sdk.IAccessTokenCache</code> type.
          */
         public T accessTokenCache(String accessTokenCache) {
             this.properties.put("accessTokenCache", accessTokenCache);
             return (T) this;
         }
         /**
-         * Box application client secret. The option is a java.lang.String type.
+         * Box application client secret. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T clientSecret(String clientSecret) {
             this.properties.put("clientSecret", clientSecret);
@@ -173,7 +177,7 @@ public interface BoxEndpointBuilder {
         /**
          * The type of encryption algorithm for JWT. Supported Algorithms:
          * RSA_SHA_256 RSA_SHA_384 RSA_SHA_512. The option is a
-         * com.box.sdk.EncryptionAlgorithm type.
+         * <code>com.box.sdk.EncryptionAlgorithm</code> type.
          */
         public T encryptionAlgorithm(EncryptionAlgorithm encryptionAlgorithm) {
             this.properties.put("encryptionAlgorithm", encryptionAlgorithm);
@@ -182,15 +186,15 @@ public interface BoxEndpointBuilder {
         /**
          * The type of encryption algorithm for JWT. Supported Algorithms:
          * RSA_SHA_256 RSA_SHA_384 RSA_SHA_512. The option will be converted to
-         * a com.box.sdk.EncryptionAlgorithm type.
+         * a <code>com.box.sdk.EncryptionAlgorithm</code> type.
          */
         public T encryptionAlgorithm(String encryptionAlgorithm) {
             this.properties.put("encryptionAlgorithm", encryptionAlgorithm);
             return (T) this;
         }
         /**
-         * The maximum number of access tokens in cache. The option is a int
-         * type.
+         * The maximum number of access tokens in cache. The option is a
+         * <code>int</code> type.
          */
         public T maxCacheEntries(int maxCacheEntries) {
             this.properties.put("maxCacheEntries", maxCacheEntries);
@@ -198,7 +202,7 @@ public interface BoxEndpointBuilder {
         }
         /**
          * The maximum number of access tokens in cache. The option will be
-         * converted to a int type.
+         * converted to a <code>int</code> type.
          */
         public T maxCacheEntries(String maxCacheEntries) {
             this.properties.put("maxCacheEntries", maxCacheEntries);
@@ -207,8 +211,8 @@ public interface BoxEndpointBuilder {
         /**
          * The type of authentication for connection. Types of Authentication:
          * STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION
-         * - OAuth 2.0 with JSON Web Tokens. The option is a java.lang.String
-         * type.
+         * - OAuth 2.0 with JSON Web Tokens. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T authenticationType(String authenticationType) {
             this.properties.put("authenticationType", authenticationType);
@@ -216,15 +220,15 @@ public interface BoxEndpointBuilder {
         }
         /**
          * The private key for generating the JWT signature. The option is a
-         * java.lang.String type.
+         * <code>java.lang.String</code> type.
          */
         public T privateKeyFile(String privateKeyFile) {
             this.properties.put("privateKeyFile", privateKeyFile);
             return (T) this;
         }
         /**
-         * The password for the private key. The option is a java.lang.String
-         * type.
+         * The password for the private key. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T privateKeyPassword(String privateKeyPassword) {
             this.properties.put("privateKeyPassword", privateKeyPassword);
@@ -232,7 +236,7 @@ public interface BoxEndpointBuilder {
         }
         /**
          * The ID for public key for validating the JWT signature. The option is
-         * a java.lang.String type.
+         * a <code>java.lang.String</code> type.
          */
         public T publicKeyId(String publicKeyId) {
             this.properties.put("publicKeyId", publicKeyId);
@@ -240,7 +244,7 @@ public interface BoxEndpointBuilder {
         }
         /**
          * To configure security using SSLContextParameters. The option is a
-         * org.apache.camel.support.jsse.SSLContextParameters type.
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
          */
         public T sslContextParameters(Object sslContextParameters) {
             this.properties.put("sslContextParameters", sslContextParameters);
@@ -248,16 +252,16 @@ public interface BoxEndpointBuilder {
         }
         /**
          * To configure security using SSLContextParameters. The option will be
-         * converted to a org.apache.camel.support.jsse.SSLContextParameters
-         * type.
+         * converted to a
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
          */
         public T sslContextParameters(String sslContextParameters) {
             this.properties.put("sslContextParameters", sslContextParameters);
             return (T) this;
         }
         /**
-         * Box user name, MUST be provided. The option is a java.lang.String
-         * type.
+         * Box user name, MUST be provided. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T userName(String userName) {
             this.properties.put("userName", userName);
@@ -265,7 +269,8 @@ public interface BoxEndpointBuilder {
         }
         /**
          * Box user password, MUST be provided if authSecureStorage is not set,
-         * or returns null on first call. The option is a java.lang.String type.
+         * or returns null on first call. The option is a
+         * <code>java.lang.String</code> type.
          */
         public T userPassword(String userPassword) {
             this.properties.put("userPassword", userPassword);
@@ -288,7 +293,7 @@ public interface BoxEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option is a boolean type.
+         * ignored. The option is a <code>boolean</code> type.
          */
         public BoxConsumerBuilder bridgeErrorHandler(boolean bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -301,7 +306,7 @@ public interface BoxEndpointBuilder {
          * message and handled by the routing Error Handler. By default the
          * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
          * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored. The option will be converted to a boolean type.
+         * ignored. The option will be converted to a <code>boolean</code> type.
          */
         public BoxConsumerBuilder bridgeErrorHandler(String bridgeErrorHandler) {
             this.properties.put("bridgeErrorHandler", bridgeErrorHandler);
@@ -312,7 +317,7 @@ public interface BoxEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option is a
-         * org.apache.camel.spi.ExceptionHandler type.
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
          */
         public BoxConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
@@ -324,7 +329,8 @@ public interface BoxEndpointBuilder {
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
          * logged at WARN or ERROR level and ignored. The option will be
-         * converted to a org.apache.camel.spi.ExceptionHandler type.
+         * converted to a <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
          */
         public BoxConsumerBuilder exceptionHandler(String exceptionHandler) {
             this.properties.put("exceptionHandler", exceptionHandler);
@@ -332,7 +338,7 @@ public interface BoxEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option is a org.apache.camel.ExchangePattern type.
+         * option is a <code>org.apache.camel.ExchangePattern</code> type.
          */
         public BoxConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
@@ -341,7 +347,8 @@ public interface BoxEndpointBuilder {
         }
         /**
          * Sets the exchange pattern when the consumer creates an exchange. The
-         * option will be converted to a org.apache.camel.ExchangePattern type.
+         * option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
          */
         public BoxConsumerBuilder exchangePattern(String exchangePattern) {
             this.properties.put("exchangePattern", exchangePattern);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BraintreeEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BraintreeEndpointBuilder.java
index d330849..12c99ba 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BraintreeEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BraintreeEndpointBuilder.java
@@ -42,7 +42,7 @@ public interface BraintreeEndpointBuilder {
         }
         /**
          * What kind of operation to perform. The option is a
-         * org.apache.camel.component.braintree.internal.BraintreeApiName type.
+         * <code>org.apache.camel.component.braintree.internal.BraintreeApiName</code> type.
          */
         public T apiName(BraintreeApiName apiName) {
             this.properties.put("apiName", apiName);
@@ -50,7 +50,7 @@ public interface BraintreeEndpointBuilder {
         }
... 96274 lines suppressed ...