You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/06/22 08:38:20 UTC

[camel] 01/02: CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files.

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

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

commit 698b79dc30ed14f6d5273f070c3acfc065de5d1b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Jun 22 10:29:15 2019 +0200

    CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files.
---
 .../camel-main-configuration-metadata.json         | 220 ++++++++++++++++++---
 .../META-INF/spring-configuration-metadata.json    | 220 ++++++++++++++++++---
 .../META-INF/spring-configuration-metadata.json    | 220 ++++++++++++++++++---
 .../apache/camel/maven/PrepareCamelMainMojo.java   |  15 +-
 .../java/org/apache/camel/maven/PrepareHelper.java | 111 +++++++++++
 5 files changed, 713 insertions(+), 73 deletions(-)

diff --git a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
index afb438b..34c79b8 100644
--- a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
+++ b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
@@ -10,31 +10,31 @@
       "name": "camel.hystrix.circuit-breaker-enabled",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Whether to use a HystrixCircuitBreaker or not. If false no circuit-breaker logic will be used and all requests permitted. <p> This is similar in effect to circuitBreakerForceClosed() except that continues tracking metrics and knowing whether it should be open/closed, this property results in not even instantiating a circuit-breaker."
+      "description": "Whether to use a HystrixCircuitBreaker or not. If false no circuit-breaker logic will be used and all requests permitted. This is similar in effect to circuitBreakerForceClosed() except that continues tracking metrics and knowing whether it should be open/closed, this property results in not even instantiating a circuit-breaker."
     },
     {
       "name": "camel.hystrix.circuit-breaker-error-threshold-percentage",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Error percentage threshold (as whole number such as 50) at which point the circuit breaker will trip open and reject requests. <p> It will stay tripped for the duration defined in circuitBreakerSleepWindowInMilliseconds; <p> The error percentage this is compared against comes from HystrixCommandMetrics.getHealthCounts()."
+      "description": "Error percentage threshold (as whole number such as 50) at which point the circuit breaker will trip open and reject requests. It will stay tripped for the duration defined in circuitBreakerSleepWindowInMilliseconds; The error percentage this is compared against comes from HystrixCommandMetrics.getHealthCounts()."
     },
     {
       "name": "camel.hystrix.circuit-breaker-force-closed",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "If true the HystrixCircuitBreaker#allowRequest() will always return true to allow requests regardless of the error percentage from HystrixCommandMetrics.getHealthCounts(). <p> The circuitBreakerForceOpen() property takes precedence so if it set to true this property does nothing."
+      "description": "If true the HystrixCircuitBreaker#allowRequest() will always return true to allow requests regardless of the error percentage from HystrixCommandMetrics.getHealthCounts(). The circuitBreakerForceOpen() property takes precedence so if it set to true this property does nothing."
     },
     {
       "name": "camel.hystrix.circuit-breaker-force-open",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "If true the HystrixCircuitBreaker.allowRequest() will always return false, causing the circuit to be open (tripped) and reject all requests. <p> This property takes precedence over circuitBreakerForceClosed();"
+      "description": "If true the HystrixCircuitBreaker.allowRequest() will always return false, causing the circuit to be open (tripped) and reject all requests. This property takes precedence over circuitBreakerForceClosed();"
     },
     {
       "name": "camel.hystrix.circuit-breaker-request-volume-threshold",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Minimum number of requests in the metricsRollingStatisticalWindowInMilliseconds() that must exist before the HystrixCircuitBreaker will trip. <p> If below this number the circuit will not trip regardless of error percentage."
+      "description": "Minimum number of requests in the metricsRollingStatisticalWindowInMilliseconds() that must exist before the HystrixCircuitBreaker will trip. If below this number the circuit will not trip regardless of error percentage."
     },
     {
       "name": "camel.hystrix.circuit-breaker-sleep-window-in-milliseconds",
@@ -46,25 +46,25 @@
       "name": "camel.hystrix.core-pool-size",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Core thread-pool size that gets passed to  {@link java.util.concurrent.ThreadPoolExecutor#setCorePoolSize(int)}"
+      "description": "Core thread-pool size that gets passed to java.util.concurrent.ThreadPoolExecutor#setCorePoolSize(int)"
     },
     {
       "name": "camel.hystrix.execution-isolation-semaphore-max-concurrent-requests",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Number of concurrent requests permitted to HystrixCommand.run(). Requests beyond the concurrent limit will be rejected. <p> Applicable only when executionIsolationStrategy == SEMAPHORE."
+      "description": "Number of concurrent requests permitted to HystrixCommand.run(). Requests beyond the concurrent limit will be rejected. Applicable only when executionIsolationStrategy == SEMAPHORE."
     },
     {
       "name": "camel.hystrix.execution-isolation-strategy",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "What isolation strategy HystrixCommand.run() will be executed with. <p> If THREAD then it will be executed on a separate thread and concurrent requests limited by the number of threads in the thread-pool. <p> If SEMAPHORE then it will be executed on the calling thread and concurrent requests limited by the semaphore count."
+      "description": "What isolation strategy HystrixCommand.run() will be executed with. If THREAD then it will be executed on a separate thread and concurrent requests limited by the number of threads in the thread-pool. If SEMAPHORE then it will be executed on the calling thread and concurrent requests limited by the semaphore count."
     },
     {
       "name": "camel.hystrix.execution-isolation-thread-interrupt-on-timeout",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Whether the execution thread should attempt an interrupt (using  {@link Future#cancel} ) when a thread times out. <p> Applicable only when executionIsolationStrategy() == THREAD."
+      "description": "Whether the execution thread should attempt an interrupt (using Future#cancel ) when a thread times out. Applicable only when executionIsolationStrategy() == THREAD."
     },
     {
       "name": "camel.hystrix.execution-timeout-enabled",
@@ -76,7 +76,7 @@
       "name": "camel.hystrix.execution-timeout-in-milliseconds",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Time in milliseconds at which point the command will timeout and halt execution. <p> If  {@link #executionIsolationThreadInterruptOnTimeout}  == true and the command is thread-isolated, the executing thread will be interrupted. If the command is semaphore-isolated and a HystrixObservableCommand, that command will get unsubscribed."
+      "description": "Time in milliseconds at which point the command will timeout and halt execution. If executionIsolationThreadInterruptOnTimeout == true and the command is thread-isolated, the executing thread will be interrupted. If the command is semaphore-isolated and a HystrixObservableCommand, that command will get unsubscribed."
     },
     {
       "name": "camel.hystrix.fallback-enabled",
@@ -100,25 +100,25 @@
       "name": "camel.hystrix.keep-alive-time",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Keep-alive time in minutes that gets passed to  {@link ThreadPoolExecutor#setKeepAliveTime(long,TimeUnit)}"
+      "description": "Keep-alive time in minutes that gets passed to ThreadPoolExecutor#setKeepAliveTime(long,TimeUnit)"
     },
     {
       "name": "camel.hystrix.maximum-size",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Maximum thread-pool size that gets passed to  {@link ThreadPoolExecutor#setMaximumPoolSize(int)} . This is the maximum amount of concurrency that can be supported without starting to reject HystrixCommands. Please note that this setting only takes effect if you also set allowMaximumSizeToDivergeFromCoreSize"
+      "description": "Maximum thread-pool size that gets passed to ThreadPoolExecutor#setMaximumPoolSize(int) . This is the maximum amount of concurrency that can be supported without starting to reject HystrixCommands. Please note that this setting only takes effect if you also set allowMaximumSizeToDivergeFromCoreSize"
     },
     {
       "name": "camel.hystrix.max-queue-size",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Max queue size that gets passed to  {@link BlockingQueue}  in HystrixConcurrencyStrategy.getBlockingQueue(int) This should only affect the instantiation of a threadpool - it is not eliglible to change a queue size on the fly. For that, use queueSizeRejectionThreshold()."
+      "description": "Max queue size that gets passed to BlockingQueue in HystrixConcurrencyStrategy.getBlockingQueue(int) This should only affect the instantiation of a threadpool - it is not eliglible to change a queue size on the fly. For that, use queueSizeRejectionThreshold()."
     },
     {
       "name": "camel.hystrix.metrics-health-snapshot-interval-in-milliseconds",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Time in milliseconds to wait between allowing health snapshots to be taken that calculate success and error percentages and affect HystrixCircuitBreaker.isOpen() status. <p> On high-volume circuits the continual calculation of error percentage can become CPU intensive thus this controls how often it is calculated."
+      "description": "Time in milliseconds to wait between allowing health snapshots to be taken that calculate success and error percentages and affect HystrixCircuitBreaker.isOpen() status. On high-volume circuits the continual calculation of error percentage can become CPU intensive thus this controls how often it is calculated."
     },
     {
       "name": "camel.hystrix.metrics-rolling-percentile-bucket-size",
@@ -154,13 +154,13 @@
       "name": "camel.hystrix.metrics-rolling-statistical-window-in-milliseconds",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "This property sets the duration of the statistical rolling window, in milliseconds. This is how long metrics are kept for the thread pool. The window is divided into buckets and “rolls” by those increments."
+      "description": "This property sets the duration of the statistical rolling window, in milliseconds. This is how long metrics are kept for the thread pool. The window is divided into buckets and rolls by those increments."
     },
     {
       "name": "camel.hystrix.queue-size-rejection-threshold",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Queue size rejection threshold is an artificial max size at which rejections will occur even if  {@link #maxQueueSize}  has not been reached. This is done because the  {@link #maxQueueSize} of a  {@link BlockingQueue}  can not be dynamically changed and we want to support dynamically changing the queue size that affects rejections. <p> This is used by HystrixCommand when queuing a thread for execution."
+      "description": "Queue size rejection threshold is an artificial max size at which rejections will occur even if maxQueueSize has not been reached. This is done because the maxQueueSize of a BlockingQueue can not be dynamically changed and we want to support dynamically changing the queue size that affects rejections. This is used by HystrixCommand when queuing a thread for execution."
     },
     {
       "name": "camel.hystrix.request-log-enabled",
@@ -196,7 +196,7 @@
       "name": "camel.main.auto-configuration-enabled",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Whether auto configuration of components/dataformats/languages is enabled or not. When enabled the configuration parameters are loaded from the properties component and optionally from the classpath file META-INF/services/org/apache/camel/autowire.properties. You can prefix the parameters in the properties file with: - camel.component.name.option1=value1 - camel.component.name.option2=value2 - camel.dataformat.name.option1=value1 - camel.dataformat.name.option2=valu [...]
+      "description": "Whether auto configuration of components/dataformats/languages is enabled or not. When enabled the configuration parameters are loaded from the properties component and optionally from the classpath file META-INF/services/org/apache/camel/autowire.properties. You can prefix the parameters in the properties file with: - camel.component.name.option1=value1 - camel.component.name.option2=value2 - camel.dataformat.name.option1=value1 - camel.dataformat.name.option2=valu [...]
       "defaultValue": true
     },
     {
@@ -210,7 +210,7 @@
       "name": "camel.main.autowire-component-properties",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Whether autowiring components with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. <p/> This option is default enabled.",
+      "description": "Whether autowiring components with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. This option is default enabled.",
       "defaultValue": true
     },
     {
@@ -224,7 +224,7 @@
       "name": "camel.main.autowire-component-properties-deep",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Whether autowiring components (with deep nesting by attempting to walk as deep down the object graph by creating new empty objects on the way if needed) with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. <p/> This option is default disabled."
+      "description": "Whether autowiring components (with deep nesting by attempting to walk as deep down the object graph by creating new empty objects on the way if needed) with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. This option is default disabled."
     },
     {
       "name": "camel.main.consumer-template-cache-size",
@@ -237,7 +237,7 @@
       "name": "camel.main.duration",
       "type": "java.lang.Long",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Sets the duration (in seconds) to run the application until it should be terminated. Defaults to -1. Any value <= 0 will run forever.",
+      "description": "Sets the duration (in seconds) to run the application until it should be terminated. Defaults to -1. Any value = 0 will run forever.",
       "defaultValue": -1
     },
     {
@@ -274,7 +274,7 @@
       "name": "camel.main.file-configurations",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Directory to load additional configuration files that contains configuration values that takes precedence over any other configuration. This can be used to refer to files that may have secret configuration that has been mounted on the file system for containers. You can specify a pattern to load from sub directories and a name pattern such as /var/app/secret/*.properties, multiple directories can be separated by comma."
+      "description": "Directory to load additional configuration files that contains configuration values that takes precedence over any other configuration. This can be used to refer to files that may have secret configuration that has been mounted on the file system for containers. You can specify a pattern to load from sub directories and a name pattern such as /var/app/secret/.properties, multiple directories can be separated by comma."
     },
     {
       "name": "camel.main.handle-fault",
@@ -320,7 +320,7 @@
       "name": "camel.main.load-type-converters",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Whether to load custom type converters by scanning classpath. This is used for backwards compatibility with Camel 2.x. Its recommended to migrate to use fast type converter loading by setting <tt>@Converter(loader = true)</tt> on your custom type converter classes.",
+      "description": "Whether to load custom type converters by scanning classpath. This is used for backwards compatibility with Camel 2.x. Its recommended to migrate to use fast type converter loading by setting Converter(loader = true) on your custom type converter classes.",
       "defaultValue": true
     },
     {
@@ -365,13 +365,13 @@
       "name": "camel.main.route-filter-exclude-pattern",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by  {@link PatternHelper#matchPattern(String,String)} . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42;  [...]
+      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by PatternHelper#matchPattern(String,String) . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42; Multiple  [...]
     },
     {
       "name": "camel.main.route-filter-include-pattern",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by  {@link PatternHelper#matchPattern(String,String)} . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42;  [...]
+      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by PatternHelper#matchPattern(String,String) . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42; Multiple  [...]
     },
     {
       "name": "camel.main.shutdown-log-inflight-exchanges-on-timeout",
@@ -497,6 +497,178 @@
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
       "description": "To turn on MDC logging"
+    },
+    {
+      "name": "rest.api-component",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the name of the Camel component to use as the REST API (such as swagger)"
+    },
+    {
+      "name": "rest.api-context-id-pattern",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Optional CamelContext id pattern to only allow Rest APIs from rest services within CamelContext's which name matches the pattern. The pattern #name# refers to the CamelContext name, to match on the current CamelContext only. For any other value, the pattern uses the rules from org.apache.camel.support.EndpointHelper#matchPattern(String,String)"
+    },
+    {
+      "name": "rest.api-context-listing",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets whether listing of all available CamelContext's with REST services in the JVM is enabled. If enabled it allows to discover these contexts, if false then only the current CamelContext is in use."
+    },
+    {
+      "name": "rest.api-context-path",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a leading API context-path the REST API services will be using. This can be used when using components such as camel-servlet where the deployed web application is deployed using a context-path."
+    },
+    {
+      "name": "rest.api-context-route-id",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the route id to use for the route that services the REST API. The route will by default use an auto assigned route id."
+    },
+    {
+      "name": "rest.api-host",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "To use an specific hostname for the API documentation (eg swagger) This can be used to override the generated host with this configured hostname"
+    },
+    {
+      "name": "rest.api-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on api level"
+    },
+    {
+      "name": "rest.api-vendor-extension",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Whether vendor extension is enabled in the Rest APIs. If enabled then Camel will include additional information as vendor extension (eg keys starting with x-) such as route ids, class names etc. Not all 3rd party API gateways and tools supports vendor-extensions when importing your API docs."
+    },
+    {
+      "name": "rest.binding-mode",
+      "type": "org.apache.camel.spi.RestBindingMode",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the binding mode to be used by the REST consumer",
+      "defaultValue": "RestBindingMode.off"
+    },
+    {
+      "name": "rest.client-request-validation",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false."
+    },
+    {
+      "name": "rest.component",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the name of the Camel component to use as the REST consumer"
+    },
+    {
+      "name": "rest.component-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on component level"
+    },
+    {
+      "name": "rest.consumer-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on consumer level"
+    },
+    {
+      "name": "rest.context-path",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a leading context-path the REST services will be using. This can be used when using components such as camel-servlet where the deployed web application is deployed using a context-path. Or for components such as camel-jetty or camel-netty4-http that includes a HTTP server."
+    },
+    {
+      "name": "rest.cors-headers",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the CORS headers to use if CORS has been enabled."
+    },
+    {
+      "name": "rest.data-format-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on data format level"
+    },
+    {
+      "name": "rest.enable-cors",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "To specify whether to enable CORS which means Camel will automatic include CORS in the HTTP headers in the response. This option is default false"
+    },
+    {
+      "name": "rest.endpoint-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on endpoint level"
+    },
+    {
+      "name": "rest.host",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the hostname to use by the REST consumer"
+    },
+    {
+      "name": "rest.host-name-resolver",
+      "type": "org.apache.camel.spi.RestHostNameResolver",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the resolver to use for resolving hostname",
+      "defaultValue": "RestHostNameResolver.allLocalIp"
+    },
+    {
+      "name": "rest.json-data-format",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a custom json data format to be used Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance."
+    },
+    {
+      "name": "rest.port",
+      "type": "java.lang.Integer",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the port to use by the REST consumer"
+    },
+    {
+      "name": "rest.producer-api-doc",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the location of the api document (swagger api) the REST producer will use to validate the REST uri and query parameters are valid accordingly to the api document. This requires adding camel-swagger-java to the classpath, and any miss configuration will let Camel fail on startup and report the error(s). The location of the api document is loaded from classpath by default, but you can use file: or http: to refer to resources to load from file or http url."
+    },
+    {
+      "name": "rest.producer-component",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the name of the Camel component to use as the REST producer"
+    },
+    {
+      "name": "rest.scheme",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the scheme to use by the REST consumer"
+    },
+    {
+      "name": "rest.skip-binding-on-error-code",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Whether to skip binding output if there is a custom HTTP error code, and instead use the response body as-is. This option is default true.",
+      "defaultValue": true
+    },
+    {
+      "name": "rest.use-x-forward-headers",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "WWhether to use X-Forward headers to set host etc. for Swagger. This option is default true.",
+      "defaultValue": true
+    },
+    {
+      "name": "rest.xml-data-format",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a custom xml data format to be used. Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance."
     }
   ]
 }
diff --git a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json b/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
index 500e343..d85ab89 100644
--- a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
+++ b/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -10,31 +10,31 @@
       "name": "camel.hystrix.circuit-breaker-enabled",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Whether to use a HystrixCircuitBreaker or not. If false no circuit-breaker logic will be used and all requests permitted. <p> This is similar in effect to circuitBreakerForceClosed() except that continues tracking metrics and knowing whether it should be open/closed, this property results in not even instantiating a circuit-breaker."
+      "description": "Whether to use a HystrixCircuitBreaker or not. If false no circuit-breaker logic will be used and all requests permitted. This is similar in effect to circuitBreakerForceClosed() except that continues tracking metrics and knowing whether it should be open/closed, this property results in not even instantiating a circuit-breaker."
     },
     {
       "name": "camel.hystrix.circuit-breaker-error-threshold-percentage",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Error percentage threshold (as whole number such as 50) at which point the circuit breaker will trip open and reject requests. <p> It will stay tripped for the duration defined in circuitBreakerSleepWindowInMilliseconds; <p> The error percentage this is compared against comes from HystrixCommandMetrics.getHealthCounts()."
+      "description": "Error percentage threshold (as whole number such as 50) at which point the circuit breaker will trip open and reject requests. It will stay tripped for the duration defined in circuitBreakerSleepWindowInMilliseconds; The error percentage this is compared against comes from HystrixCommandMetrics.getHealthCounts()."
     },
     {
       "name": "camel.hystrix.circuit-breaker-force-closed",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "If true the HystrixCircuitBreaker#allowRequest() will always return true to allow requests regardless of the error percentage from HystrixCommandMetrics.getHealthCounts(). <p> The circuitBreakerForceOpen() property takes precedence so if it set to true this property does nothing."
+      "description": "If true the HystrixCircuitBreaker#allowRequest() will always return true to allow requests regardless of the error percentage from HystrixCommandMetrics.getHealthCounts(). The circuitBreakerForceOpen() property takes precedence so if it set to true this property does nothing."
     },
     {
       "name": "camel.hystrix.circuit-breaker-force-open",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "If true the HystrixCircuitBreaker.allowRequest() will always return false, causing the circuit to be open (tripped) and reject all requests. <p> This property takes precedence over circuitBreakerForceClosed();"
+      "description": "If true the HystrixCircuitBreaker.allowRequest() will always return false, causing the circuit to be open (tripped) and reject all requests. This property takes precedence over circuitBreakerForceClosed();"
     },
     {
       "name": "camel.hystrix.circuit-breaker-request-volume-threshold",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Minimum number of requests in the metricsRollingStatisticalWindowInMilliseconds() that must exist before the HystrixCircuitBreaker will trip. <p> If below this number the circuit will not trip regardless of error percentage."
+      "description": "Minimum number of requests in the metricsRollingStatisticalWindowInMilliseconds() that must exist before the HystrixCircuitBreaker will trip. If below this number the circuit will not trip regardless of error percentage."
     },
     {
       "name": "camel.hystrix.circuit-breaker-sleep-window-in-milliseconds",
@@ -46,25 +46,25 @@
       "name": "camel.hystrix.core-pool-size",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Core thread-pool size that gets passed to  {@link java.util.concurrent.ThreadPoolExecutor#setCorePoolSize(int)}"
+      "description": "Core thread-pool size that gets passed to java.util.concurrent.ThreadPoolExecutor#setCorePoolSize(int)"
     },
     {
       "name": "camel.hystrix.execution-isolation-semaphore-max-concurrent-requests",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Number of concurrent requests permitted to HystrixCommand.run(). Requests beyond the concurrent limit will be rejected. <p> Applicable only when executionIsolationStrategy == SEMAPHORE."
+      "description": "Number of concurrent requests permitted to HystrixCommand.run(). Requests beyond the concurrent limit will be rejected. Applicable only when executionIsolationStrategy == SEMAPHORE."
     },
     {
       "name": "camel.hystrix.execution-isolation-strategy",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "What isolation strategy HystrixCommand.run() will be executed with. <p> If THREAD then it will be executed on a separate thread and concurrent requests limited by the number of threads in the thread-pool. <p> If SEMAPHORE then it will be executed on the calling thread and concurrent requests limited by the semaphore count."
+      "description": "What isolation strategy HystrixCommand.run() will be executed with. If THREAD then it will be executed on a separate thread and concurrent requests limited by the number of threads in the thread-pool. If SEMAPHORE then it will be executed on the calling thread and concurrent requests limited by the semaphore count."
     },
     {
       "name": "camel.hystrix.execution-isolation-thread-interrupt-on-timeout",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Whether the execution thread should attempt an interrupt (using  {@link Future#cancel} ) when a thread times out. <p> Applicable only when executionIsolationStrategy() == THREAD."
+      "description": "Whether the execution thread should attempt an interrupt (using Future#cancel ) when a thread times out. Applicable only when executionIsolationStrategy() == THREAD."
     },
     {
       "name": "camel.hystrix.execution-timeout-enabled",
@@ -76,7 +76,7 @@
       "name": "camel.hystrix.execution-timeout-in-milliseconds",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Time in milliseconds at which point the command will timeout and halt execution. <p> If  {@link #executionIsolationThreadInterruptOnTimeout}  == true and the command is thread-isolated, the executing thread will be interrupted. If the command is semaphore-isolated and a HystrixObservableCommand, that command will get unsubscribed."
+      "description": "Time in milliseconds at which point the command will timeout and halt execution. If executionIsolationThreadInterruptOnTimeout == true and the command is thread-isolated, the executing thread will be interrupted. If the command is semaphore-isolated and a HystrixObservableCommand, that command will get unsubscribed."
     },
     {
       "name": "camel.hystrix.fallback-enabled",
@@ -100,25 +100,25 @@
       "name": "camel.hystrix.keep-alive-time",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Keep-alive time in minutes that gets passed to  {@link ThreadPoolExecutor#setKeepAliveTime(long,TimeUnit)}"
+      "description": "Keep-alive time in minutes that gets passed to ThreadPoolExecutor#setKeepAliveTime(long,TimeUnit)"
     },
     {
       "name": "camel.hystrix.maximum-size",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Maximum thread-pool size that gets passed to  {@link ThreadPoolExecutor#setMaximumPoolSize(int)} . This is the maximum amount of concurrency that can be supported without starting to reject HystrixCommands. Please note that this setting only takes effect if you also set allowMaximumSizeToDivergeFromCoreSize"
+      "description": "Maximum thread-pool size that gets passed to ThreadPoolExecutor#setMaximumPoolSize(int) . This is the maximum amount of concurrency that can be supported without starting to reject HystrixCommands. Please note that this setting only takes effect if you also set allowMaximumSizeToDivergeFromCoreSize"
     },
     {
       "name": "camel.hystrix.max-queue-size",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Max queue size that gets passed to  {@link BlockingQueue}  in HystrixConcurrencyStrategy.getBlockingQueue(int) This should only affect the instantiation of a threadpool - it is not eliglible to change a queue size on the fly. For that, use queueSizeRejectionThreshold()."
+      "description": "Max queue size that gets passed to BlockingQueue in HystrixConcurrencyStrategy.getBlockingQueue(int) This should only affect the instantiation of a threadpool - it is not eliglible to change a queue size on the fly. For that, use queueSizeRejectionThreshold()."
     },
     {
       "name": "camel.hystrix.metrics-health-snapshot-interval-in-milliseconds",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Time in milliseconds to wait between allowing health snapshots to be taken that calculate success and error percentages and affect HystrixCircuitBreaker.isOpen() status. <p> On high-volume circuits the continual calculation of error percentage can become CPU intensive thus this controls how often it is calculated."
+      "description": "Time in milliseconds to wait between allowing health snapshots to be taken that calculate success and error percentages and affect HystrixCircuitBreaker.isOpen() status. On high-volume circuits the continual calculation of error percentage can become CPU intensive thus this controls how often it is calculated."
     },
     {
       "name": "camel.hystrix.metrics-rolling-percentile-bucket-size",
@@ -154,13 +154,13 @@
       "name": "camel.hystrix.metrics-rolling-statistical-window-in-milliseconds",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "This property sets the duration of the statistical rolling window, in milliseconds. This is how long metrics are kept for the thread pool. The window is divided into buckets and “rolls” by those increments."
+      "description": "This property sets the duration of the statistical rolling window, in milliseconds. This is how long metrics are kept for the thread pool. The window is divided into buckets and rolls by those increments."
     },
     {
       "name": "camel.hystrix.queue-size-rejection-threshold",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Queue size rejection threshold is an artificial max size at which rejections will occur even if  {@link #maxQueueSize}  has not been reached. This is done because the  {@link #maxQueueSize} of a  {@link BlockingQueue}  can not be dynamically changed and we want to support dynamically changing the queue size that affects rejections. <p> This is used by HystrixCommand when queuing a thread for execution."
+      "description": "Queue size rejection threshold is an artificial max size at which rejections will occur even if maxQueueSize has not been reached. This is done because the maxQueueSize of a BlockingQueue can not be dynamically changed and we want to support dynamically changing the queue size that affects rejections. This is used by HystrixCommand when queuing a thread for execution."
     },
     {
       "name": "camel.hystrix.request-log-enabled",
@@ -196,7 +196,7 @@
       "name": "camel.main.auto-configuration-enabled",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Whether auto configuration of components/dataformats/languages is enabled or not. When enabled the configuration parameters are loaded from the properties component and optionally from the classpath file META-INF/services/org/apache/camel/autowire.properties. You can prefix the parameters in the properties file with: - camel.component.name.option1=value1 - camel.component.name.option2=value2 - camel.dataformat.name.option1=value1 - camel.dataformat.name.option2=valu [...]
+      "description": "Whether auto configuration of components/dataformats/languages is enabled or not. When enabled the configuration parameters are loaded from the properties component and optionally from the classpath file META-INF/services/org/apache/camel/autowire.properties. You can prefix the parameters in the properties file with: - camel.component.name.option1=value1 - camel.component.name.option2=value2 - camel.dataformat.name.option1=value1 - camel.dataformat.name.option2=valu [...]
       "defaultValue": true
     },
     {
@@ -210,7 +210,7 @@
       "name": "camel.main.autowire-component-properties",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Whether autowiring components with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. <p/> This option is default enabled.",
+      "description": "Whether autowiring components with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. This option is default enabled.",
       "defaultValue": true
     },
     {
@@ -224,7 +224,7 @@
       "name": "camel.main.autowire-component-properties-deep",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Whether autowiring components (with deep nesting by attempting to walk as deep down the object graph by creating new empty objects on the way if needed) with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. <p/> This option is default disabled."
+      "description": "Whether autowiring components (with deep nesting by attempting to walk as deep down the object graph by creating new empty objects on the way if needed) with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. This option is default disabled."
     },
     {
       "name": "camel.main.consumer-template-cache-size",
@@ -237,7 +237,7 @@
       "name": "camel.main.duration",
       "type": "java.lang.Long",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Sets the duration (in seconds) to run the application until it should be terminated. Defaults to -1. Any value <= 0 will run forever.",
+      "description": "Sets the duration (in seconds) to run the application until it should be terminated. Defaults to -1. Any value = 0 will run forever.",
       "defaultValue": -1
     },
     {
@@ -274,7 +274,7 @@
       "name": "camel.main.file-configurations",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Directory to load additional configuration files that contains configuration values that takes precedence over any other configuration. This can be used to refer to files that may have secret configuration that has been mounted on the file system for containers. You can specify a pattern to load from sub directories and a name pattern such as /var/app/secret/*.properties, multiple directories can be separated by comma."
+      "description": "Directory to load additional configuration files that contains configuration values that takes precedence over any other configuration. This can be used to refer to files that may have secret configuration that has been mounted on the file system for containers. You can specify a pattern to load from sub directories and a name pattern such as /var/app/secret/.properties, multiple directories can be separated by comma."
     },
     {
       "name": "camel.main.handle-fault",
@@ -320,7 +320,7 @@
       "name": "camel.main.load-type-converters",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Whether to load custom type converters by scanning classpath. This is used for backwards compatibility with Camel 2.x. Its recommended to migrate to use fast type converter loading by setting <tt>@Converter(loader = true)</tt> on your custom type converter classes.",
+      "description": "Whether to load custom type converters by scanning classpath. This is used for backwards compatibility with Camel 2.x. Its recommended to migrate to use fast type converter loading by setting Converter(loader = true) on your custom type converter classes.",
       "defaultValue": true
     },
     {
@@ -365,13 +365,13 @@
       "name": "camel.main.route-filter-exclude-pattern",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by  {@link PatternHelper#matchPattern(String,String)} . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42;  [...]
+      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by PatternHelper#matchPattern(String,String) . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42; Multiple  [...]
     },
     {
       "name": "camel.main.route-filter-include-pattern",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by  {@link PatternHelper#matchPattern(String,String)} . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42;  [...]
+      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by PatternHelper#matchPattern(String,String) . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42; Multiple  [...]
     },
     {
       "name": "camel.main.shutdown-log-inflight-exchanges-on-timeout",
@@ -499,6 +499,178 @@
       "description": "To turn on MDC logging"
     },
     {
+      "name": "rest.api-component",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the name of the Camel component to use as the REST API (such as swagger)"
+    },
+    {
+      "name": "rest.api-context-id-pattern",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Optional CamelContext id pattern to only allow Rest APIs from rest services within CamelContext's which name matches the pattern. The pattern #name# refers to the CamelContext name, to match on the current CamelContext only. For any other value, the pattern uses the rules from org.apache.camel.support.EndpointHelper#matchPattern(String,String)"
+    },
+    {
+      "name": "rest.api-context-listing",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets whether listing of all available CamelContext's with REST services in the JVM is enabled. If enabled it allows to discover these contexts, if false then only the current CamelContext is in use."
+    },
+    {
+      "name": "rest.api-context-path",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a leading API context-path the REST API services will be using. This can be used when using components such as camel-servlet where the deployed web application is deployed using a context-path."
+    },
+    {
+      "name": "rest.api-context-route-id",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the route id to use for the route that services the REST API. The route will by default use an auto assigned route id."
+    },
+    {
+      "name": "rest.api-host",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "To use an specific hostname for the API documentation (eg swagger) This can be used to override the generated host with this configured hostname"
+    },
+    {
+      "name": "rest.api-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on api level"
+    },
+    {
+      "name": "rest.api-vendor-extension",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Whether vendor extension is enabled in the Rest APIs. If enabled then Camel will include additional information as vendor extension (eg keys starting with x-) such as route ids, class names etc. Not all 3rd party API gateways and tools supports vendor-extensions when importing your API docs."
+    },
+    {
+      "name": "rest.binding-mode",
+      "type": "org.apache.camel.spi.RestBindingMode",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the binding mode to be used by the REST consumer",
+      "defaultValue": "RestBindingMode.off"
+    },
+    {
+      "name": "rest.client-request-validation",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false."
+    },
+    {
+      "name": "rest.component",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the name of the Camel component to use as the REST consumer"
+    },
+    {
+      "name": "rest.component-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on component level"
+    },
+    {
+      "name": "rest.consumer-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on consumer level"
+    },
+    {
+      "name": "rest.context-path",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a leading context-path the REST services will be using. This can be used when using components such as camel-servlet where the deployed web application is deployed using a context-path. Or for components such as camel-jetty or camel-netty4-http that includes a HTTP server."
+    },
+    {
+      "name": "rest.cors-headers",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the CORS headers to use if CORS has been enabled."
+    },
+    {
+      "name": "rest.data-format-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on data format level"
+    },
+    {
+      "name": "rest.enable-cors",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "To specify whether to enable CORS which means Camel will automatic include CORS in the HTTP headers in the response. This option is default false"
+    },
+    {
+      "name": "rest.endpoint-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on endpoint level"
+    },
+    {
+      "name": "rest.host",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the hostname to use by the REST consumer"
+    },
+    {
+      "name": "rest.host-name-resolver",
+      "type": "org.apache.camel.spi.RestHostNameResolver",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the resolver to use for resolving hostname",
+      "defaultValue": "RestHostNameResolver.allLocalIp"
+    },
+    {
+      "name": "rest.json-data-format",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a custom json data format to be used Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance."
+    },
+    {
+      "name": "rest.port",
+      "type": "java.lang.Integer",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the port to use by the REST consumer"
+    },
+    {
+      "name": "rest.producer-api-doc",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the location of the api document (swagger api) the REST producer will use to validate the REST uri and query parameters are valid accordingly to the api document. This requires adding camel-swagger-java to the classpath, and any miss configuration will let Camel fail on startup and report the error(s). The location of the api document is loaded from classpath by default, but you can use file: or http: to refer to resources to load from file or http url."
+    },
+    {
+      "name": "rest.producer-component",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the name of the Camel component to use as the REST producer"
+    },
+    {
+      "name": "rest.scheme",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the scheme to use by the REST consumer"
+    },
+    {
+      "name": "rest.skip-binding-on-error-code",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Whether to skip binding output if there is a custom HTTP error code, and instead use the response body as-is. This option is default true.",
+      "defaultValue": true
+    },
+    {
+      "name": "rest.use-x-forward-headers",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "WWhether to use X-Forward headers to set host etc. for Swagger. This option is default true.",
+      "defaultValue": true
+    },
+    {
+      "name": "rest.xml-data-format",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a custom xml data format to be used. Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance."
+    },
+    {
       "name": "camel.component.bean.cache",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.component.bean.BeanComponent",
diff --git a/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json b/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json
index a94ec70..8008614 100644
--- a/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json
+++ b/examples/camel-example-main/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -10,31 +10,31 @@
       "name": "camel.hystrix.circuit-breaker-enabled",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Whether to use a HystrixCircuitBreaker or not. If false no circuit-breaker logic will be used and all requests permitted. <p> This is similar in effect to circuitBreakerForceClosed() except that continues tracking metrics and knowing whether it should be open/closed, this property results in not even instantiating a circuit-breaker."
+      "description": "Whether to use a HystrixCircuitBreaker or not. If false no circuit-breaker logic will be used and all requests permitted. This is similar in effect to circuitBreakerForceClosed() except that continues tracking metrics and knowing whether it should be open/closed, this property results in not even instantiating a circuit-breaker."
     },
     {
       "name": "camel.hystrix.circuit-breaker-error-threshold-percentage",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Error percentage threshold (as whole number such as 50) at which point the circuit breaker will trip open and reject requests. <p> It will stay tripped for the duration defined in circuitBreakerSleepWindowInMilliseconds; <p> The error percentage this is compared against comes from HystrixCommandMetrics.getHealthCounts()."
+      "description": "Error percentage threshold (as whole number such as 50) at which point the circuit breaker will trip open and reject requests. It will stay tripped for the duration defined in circuitBreakerSleepWindowInMilliseconds; The error percentage this is compared against comes from HystrixCommandMetrics.getHealthCounts()."
     },
     {
       "name": "camel.hystrix.circuit-breaker-force-closed",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "If true the HystrixCircuitBreaker#allowRequest() will always return true to allow requests regardless of the error percentage from HystrixCommandMetrics.getHealthCounts(). <p> The circuitBreakerForceOpen() property takes precedence so if it set to true this property does nothing."
+      "description": "If true the HystrixCircuitBreaker#allowRequest() will always return true to allow requests regardless of the error percentage from HystrixCommandMetrics.getHealthCounts(). The circuitBreakerForceOpen() property takes precedence so if it set to true this property does nothing."
     },
     {
       "name": "camel.hystrix.circuit-breaker-force-open",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "If true the HystrixCircuitBreaker.allowRequest() will always return false, causing the circuit to be open (tripped) and reject all requests. <p> This property takes precedence over circuitBreakerForceClosed();"
+      "description": "If true the HystrixCircuitBreaker.allowRequest() will always return false, causing the circuit to be open (tripped) and reject all requests. This property takes precedence over circuitBreakerForceClosed();"
     },
     {
       "name": "camel.hystrix.circuit-breaker-request-volume-threshold",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Minimum number of requests in the metricsRollingStatisticalWindowInMilliseconds() that must exist before the HystrixCircuitBreaker will trip. <p> If below this number the circuit will not trip regardless of error percentage."
+      "description": "Minimum number of requests in the metricsRollingStatisticalWindowInMilliseconds() that must exist before the HystrixCircuitBreaker will trip. If below this number the circuit will not trip regardless of error percentage."
     },
     {
       "name": "camel.hystrix.circuit-breaker-sleep-window-in-milliseconds",
@@ -46,25 +46,25 @@
       "name": "camel.hystrix.core-pool-size",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Core thread-pool size that gets passed to  {@link java.util.concurrent.ThreadPoolExecutor#setCorePoolSize(int)}"
+      "description": "Core thread-pool size that gets passed to java.util.concurrent.ThreadPoolExecutor#setCorePoolSize(int)"
     },
     {
       "name": "camel.hystrix.execution-isolation-semaphore-max-concurrent-requests",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Number of concurrent requests permitted to HystrixCommand.run(). Requests beyond the concurrent limit will be rejected. <p> Applicable only when executionIsolationStrategy == SEMAPHORE."
+      "description": "Number of concurrent requests permitted to HystrixCommand.run(). Requests beyond the concurrent limit will be rejected. Applicable only when executionIsolationStrategy == SEMAPHORE."
     },
     {
       "name": "camel.hystrix.execution-isolation-strategy",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "What isolation strategy HystrixCommand.run() will be executed with. <p> If THREAD then it will be executed on a separate thread and concurrent requests limited by the number of threads in the thread-pool. <p> If SEMAPHORE then it will be executed on the calling thread and concurrent requests limited by the semaphore count."
+      "description": "What isolation strategy HystrixCommand.run() will be executed with. If THREAD then it will be executed on a separate thread and concurrent requests limited by the number of threads in the thread-pool. If SEMAPHORE then it will be executed on the calling thread and concurrent requests limited by the semaphore count."
     },
     {
       "name": "camel.hystrix.execution-isolation-thread-interrupt-on-timeout",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Whether the execution thread should attempt an interrupt (using  {@link Future#cancel} ) when a thread times out. <p> Applicable only when executionIsolationStrategy() == THREAD."
+      "description": "Whether the execution thread should attempt an interrupt (using Future#cancel ) when a thread times out. Applicable only when executionIsolationStrategy() == THREAD."
     },
     {
       "name": "camel.hystrix.execution-timeout-enabled",
@@ -76,7 +76,7 @@
       "name": "camel.hystrix.execution-timeout-in-milliseconds",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Time in milliseconds at which point the command will timeout and halt execution. <p> If  {@link #executionIsolationThreadInterruptOnTimeout}  == true and the command is thread-isolated, the executing thread will be interrupted. If the command is semaphore-isolated and a HystrixObservableCommand, that command will get unsubscribed."
+      "description": "Time in milliseconds at which point the command will timeout and halt execution. If executionIsolationThreadInterruptOnTimeout == true and the command is thread-isolated, the executing thread will be interrupted. If the command is semaphore-isolated and a HystrixObservableCommand, that command will get unsubscribed."
     },
     {
       "name": "camel.hystrix.fallback-enabled",
@@ -100,25 +100,25 @@
       "name": "camel.hystrix.keep-alive-time",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Keep-alive time in minutes that gets passed to  {@link ThreadPoolExecutor#setKeepAliveTime(long,TimeUnit)}"
+      "description": "Keep-alive time in minutes that gets passed to ThreadPoolExecutor#setKeepAliveTime(long,TimeUnit)"
     },
     {
       "name": "camel.hystrix.maximum-size",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Maximum thread-pool size that gets passed to  {@link ThreadPoolExecutor#setMaximumPoolSize(int)} . This is the maximum amount of concurrency that can be supported without starting to reject HystrixCommands. Please note that this setting only takes effect if you also set allowMaximumSizeToDivergeFromCoreSize"
+      "description": "Maximum thread-pool size that gets passed to ThreadPoolExecutor#setMaximumPoolSize(int) . This is the maximum amount of concurrency that can be supported without starting to reject HystrixCommands. Please note that this setting only takes effect if you also set allowMaximumSizeToDivergeFromCoreSize"
     },
     {
       "name": "camel.hystrix.max-queue-size",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Max queue size that gets passed to  {@link BlockingQueue}  in HystrixConcurrencyStrategy.getBlockingQueue(int) This should only affect the instantiation of a threadpool - it is not eliglible to change a queue size on the fly. For that, use queueSizeRejectionThreshold()."
+      "description": "Max queue size that gets passed to BlockingQueue in HystrixConcurrencyStrategy.getBlockingQueue(int) This should only affect the instantiation of a threadpool - it is not eliglible to change a queue size on the fly. For that, use queueSizeRejectionThreshold()."
     },
     {
       "name": "camel.hystrix.metrics-health-snapshot-interval-in-milliseconds",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Time in milliseconds to wait between allowing health snapshots to be taken that calculate success and error percentages and affect HystrixCircuitBreaker.isOpen() status. <p> On high-volume circuits the continual calculation of error percentage can become CPU intensive thus this controls how often it is calculated."
+      "description": "Time in milliseconds to wait between allowing health snapshots to be taken that calculate success and error percentages and affect HystrixCircuitBreaker.isOpen() status. On high-volume circuits the continual calculation of error percentage can become CPU intensive thus this controls how often it is calculated."
     },
     {
       "name": "camel.hystrix.metrics-rolling-percentile-bucket-size",
@@ -154,13 +154,13 @@
       "name": "camel.hystrix.metrics-rolling-statistical-window-in-milliseconds",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "This property sets the duration of the statistical rolling window, in milliseconds. This is how long metrics are kept for the thread pool. The window is divided into buckets and “rolls” by those increments."
+      "description": "This property sets the duration of the statistical rolling window, in milliseconds. This is how long metrics are kept for the thread pool. The window is divided into buckets and rolls by those increments."
     },
     {
       "name": "camel.hystrix.queue-size-rejection-threshold",
       "type": "java.lang.Integer",
       "sourceType": "org.apache.camel.main.HystrixConfigurationProperties",
-      "description": "Queue size rejection threshold is an artificial max size at which rejections will occur even if  {@link #maxQueueSize}  has not been reached. This is done because the  {@link #maxQueueSize} of a  {@link BlockingQueue}  can not be dynamically changed and we want to support dynamically changing the queue size that affects rejections. <p> This is used by HystrixCommand when queuing a thread for execution."
+      "description": "Queue size rejection threshold is an artificial max size at which rejections will occur even if maxQueueSize has not been reached. This is done because the maxQueueSize of a BlockingQueue can not be dynamically changed and we want to support dynamically changing the queue size that affects rejections. This is used by HystrixCommand when queuing a thread for execution."
     },
     {
       "name": "camel.hystrix.request-log-enabled",
@@ -196,7 +196,7 @@
       "name": "camel.main.auto-configuration-enabled",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Whether auto configuration of components/dataformats/languages is enabled or not. When enabled the configuration parameters are loaded from the properties component and optionally from the classpath file META-INF/services/org/apache/camel/autowire.properties. You can prefix the parameters in the properties file with: - camel.component.name.option1=value1 - camel.component.name.option2=value2 - camel.dataformat.name.option1=value1 - camel.dataformat.name.option2=valu [...]
+      "description": "Whether auto configuration of components/dataformats/languages is enabled or not. When enabled the configuration parameters are loaded from the properties component and optionally from the classpath file META-INF/services/org/apache/camel/autowire.properties. You can prefix the parameters in the properties file with: - camel.component.name.option1=value1 - camel.component.name.option2=value2 - camel.dataformat.name.option1=value1 - camel.dataformat.name.option2=valu [...]
       "defaultValue": true
     },
     {
@@ -210,7 +210,7 @@
       "name": "camel.main.autowire-component-properties",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Whether autowiring components with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. <p/> This option is default enabled.",
+      "description": "Whether autowiring components with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. This option is default enabled.",
       "defaultValue": true
     },
     {
@@ -224,7 +224,7 @@
       "name": "camel.main.autowire-component-properties-deep",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Whether autowiring components (with deep nesting by attempting to walk as deep down the object graph by creating new empty objects on the way if needed) with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. <p/> This option is default disabled."
+      "description": "Whether autowiring components (with deep nesting by attempting to walk as deep down the object graph by creating new empty objects on the way if needed) with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. This option is default disabled."
     },
     {
       "name": "camel.main.consumer-template-cache-size",
@@ -237,7 +237,7 @@
       "name": "camel.main.duration",
       "type": "java.lang.Long",
       "sourceType": "org.apache.camel.main.MainConfigurationProperties",
-      "description": "Sets the duration (in seconds) to run the application until it should be terminated. Defaults to -1. Any value <= 0 will run forever.",
+      "description": "Sets the duration (in seconds) to run the application until it should be terminated. Defaults to -1. Any value = 0 will run forever.",
       "defaultValue": -1
     },
     {
@@ -274,7 +274,7 @@
       "name": "camel.main.file-configurations",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Directory to load additional configuration files that contains configuration values that takes precedence over any other configuration. This can be used to refer to files that may have secret configuration that has been mounted on the file system for containers. You can specify a pattern to load from sub directories and a name pattern such as /var/app/secret/*.properties, multiple directories can be separated by comma."
+      "description": "Directory to load additional configuration files that contains configuration values that takes precedence over any other configuration. This can be used to refer to files that may have secret configuration that has been mounted on the file system for containers. You can specify a pattern to load from sub directories and a name pattern such as /var/app/secret/.properties, multiple directories can be separated by comma."
     },
     {
       "name": "camel.main.handle-fault",
@@ -320,7 +320,7 @@
       "name": "camel.main.load-type-converters",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Whether to load custom type converters by scanning classpath. This is used for backwards compatibility with Camel 2.x. Its recommended to migrate to use fast type converter loading by setting <tt>@Converter(loader = true)</tt> on your custom type converter classes.",
+      "description": "Whether to load custom type converters by scanning classpath. This is used for backwards compatibility with Camel 2.x. Its recommended to migrate to use fast type converter loading by setting Converter(loader = true) on your custom type converter classes.",
       "defaultValue": true
     },
     {
@@ -365,13 +365,13 @@
       "name": "camel.main.route-filter-exclude-pattern",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by  {@link PatternHelper#matchPattern(String,String)} . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42;  [...]
+      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by PatternHelper#matchPattern(String,String) . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42; Multiple  [...]
     },
     {
       "name": "camel.main.route-filter-include-pattern",
       "type": "java.lang.String",
       "sourceType": "org.apache.camel.main.DefaultConfigurationProperties",
-      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by  {@link PatternHelper#matchPattern(String,String)} . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42;  [...]
+      "description": "Used for filtering routes routes matching the given pattern, which follows the following rules: - Match by route id - Match by route input endpoint uri The matching is using exact match, by wildcard and regular expression as documented by PatternHelper#matchPattern(String,String) . For example to only include routes which starts with foo in their route id's, use: include=foo&#42; And to exclude routes which starts from JMS endpoints, use: exclude=jms:&#42; Multiple  [...]
     },
     {
       "name": "camel.main.shutdown-log-inflight-exchanges-on-timeout",
@@ -499,6 +499,178 @@
       "description": "To turn on MDC logging"
     },
     {
+      "name": "rest.api-component",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the name of the Camel component to use as the REST API (such as swagger)"
+    },
+    {
+      "name": "rest.api-context-id-pattern",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Optional CamelContext id pattern to only allow Rest APIs from rest services within CamelContext's which name matches the pattern. The pattern #name# refers to the CamelContext name, to match on the current CamelContext only. For any other value, the pattern uses the rules from org.apache.camel.support.EndpointHelper#matchPattern(String,String)"
+    },
+    {
+      "name": "rest.api-context-listing",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets whether listing of all available CamelContext's with REST services in the JVM is enabled. If enabled it allows to discover these contexts, if false then only the current CamelContext is in use."
+    },
+    {
+      "name": "rest.api-context-path",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a leading API context-path the REST API services will be using. This can be used when using components such as camel-servlet where the deployed web application is deployed using a context-path."
+    },
+    {
+      "name": "rest.api-context-route-id",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the route id to use for the route that services the REST API. The route will by default use an auto assigned route id."
+    },
+    {
+      "name": "rest.api-host",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "To use an specific hostname for the API documentation (eg swagger) This can be used to override the generated host with this configured hostname"
+    },
+    {
+      "name": "rest.api-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on api level"
+    },
+    {
+      "name": "rest.api-vendor-extension",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Whether vendor extension is enabled in the Rest APIs. If enabled then Camel will include additional information as vendor extension (eg keys starting with x-) such as route ids, class names etc. Not all 3rd party API gateways and tools supports vendor-extensions when importing your API docs."
+    },
+    {
+      "name": "rest.binding-mode",
+      "type": "org.apache.camel.spi.RestBindingMode",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the binding mode to be used by the REST consumer",
+      "defaultValue": "RestBindingMode.off"
+    },
+    {
+      "name": "rest.client-request-validation",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Whether to enable validation of the client request to check whether the Content-Type and Accept headers from the client is supported by the Rest-DSL configuration of its consumes/produces settings. This can be turned on, to enable this check. In case of validation error, then HTTP Status codes 415 or 406 is returned. The default value is false."
+    },
+    {
+      "name": "rest.component",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the name of the Camel component to use as the REST consumer"
+    },
+    {
+      "name": "rest.component-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on component level"
+    },
+    {
+      "name": "rest.consumer-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on consumer level"
+    },
+    {
+      "name": "rest.context-path",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a leading context-path the REST services will be using. This can be used when using components such as camel-servlet where the deployed web application is deployed using a context-path. Or for components such as camel-jetty or camel-netty4-http that includes a HTTP server."
+    },
+    {
+      "name": "rest.cors-headers",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the CORS headers to use if CORS has been enabled."
+    },
+    {
+      "name": "rest.data-format-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on data format level"
+    },
+    {
+      "name": "rest.enable-cors",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "To specify whether to enable CORS which means Camel will automatic include CORS in the HTTP headers in the response. This option is default false"
+    },
+    {
+      "name": "rest.endpoint-properties",
+      "type": "java.util.Map",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets additional options on endpoint level"
+    },
+    {
+      "name": "rest.host",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the hostname to use by the REST consumer"
+    },
+    {
+      "name": "rest.host-name-resolver",
+      "type": "org.apache.camel.spi.RestHostNameResolver",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the resolver to use for resolving hostname",
+      "defaultValue": "RestHostNameResolver.allLocalIp"
+    },
+    {
+      "name": "rest.json-data-format",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a custom json data format to be used Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance."
+    },
+    {
+      "name": "rest.port",
+      "type": "java.lang.Integer",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the port to use by the REST consumer"
+    },
+    {
+      "name": "rest.producer-api-doc",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the location of the api document (swagger api) the REST producer will use to validate the REST uri and query parameters are valid accordingly to the api document. This requires adding camel-swagger-java to the classpath, and any miss configuration will let Camel fail on startup and report the error(s). The location of the api document is loaded from classpath by default, but you can use file: or http: to refer to resources to load from file or http url."
+    },
+    {
+      "name": "rest.producer-component",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the name of the Camel component to use as the REST producer"
+    },
+    {
+      "name": "rest.scheme",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets the scheme to use by the REST consumer"
+    },
+    {
+      "name": "rest.skip-binding-on-error-code",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Whether to skip binding output if there is a custom HTTP error code, and instead use the response body as-is. This option is default true.",
+      "defaultValue": true
+    },
+    {
+      "name": "rest.use-x-forward-headers",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "WWhether to use X-Forward headers to set host etc. for Swagger. This option is default true.",
+      "defaultValue": true
+    },
+    {
+      "name": "rest.xml-data-format",
+      "type": "java.lang.String",
+      "sourceType": "org.apache.camel.spi.RestConfiguration",
+      "description": "Sets a custom xml data format to be used. Important: This option is only for setting a custom name of the data format, not to refer to an existing data format instance."
+    },
+    {
       "name": "camel.component.bean.cache",
       "type": "java.lang.Boolean",
       "sourceType": "org.apache.camel.component.bean.BeanComponent",
diff --git a/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java b/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java
index e75dc6a..c89661f 100644
--- a/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java
+++ b/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareCamelMainMojo.java
@@ -31,6 +31,7 @@ import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
+import static org.apache.camel.maven.PrepareHelper.sanitizeDescription;
 import static org.apache.camel.util.StringHelper.camelCaseToDash;
 
 /**
@@ -82,6 +83,16 @@ public class PrepareCamelMainMojo extends AbstractMojo {
             }
         }
 
+        // include additional rest configuration from camel-api
+        File restConfig = new File(buildDir, "../../camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java");
+        try {
+            List<ConfigurationModel> model = parser.parseConfigurationSource(restConfig);
+            model.stream().forEach(m -> m.setName("rest." + m.getName()));
+            data.addAll(model);
+        } catch (Exception e) {
+            throw new MojoFailureException("Error parsing file " + restConfig + " due " + e.getMessage(), e);
+        }
+
         // lets sort so they are always ordered
         data.sort((o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()));
 
@@ -94,7 +105,7 @@ public class PrepareCamelMainMojo extends AbstractMojo {
                 ConfigurationModel row = data.get(i);
                 String name = camelCaseToDash(row.getName());
                 String javaType = springBootJavaType(row.getJavaType());
-                String desc = row.getDescription();
+                String desc = sanitizeDescription(row.getDescription(), false);
                 String sourceType = row.getSourceType();
                 String defaultValue = row.getDefaultValue();
                 sb.append("    {\n");
@@ -157,4 +168,6 @@ public class PrepareCamelMainMojo extends AbstractMojo {
         }
         return true;
     }
+
+
 }
diff --git a/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareHelper.java b/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareHelper.java
new file mode 100644
index 0000000..17044da
--- /dev/null
+++ b/tooling/maven/camel-main-package-maven-plugin/src/main/java/org/apache/camel/maven/PrepareHelper.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.maven;
+
+public final class PrepareHelper {
+
+    private static final String VALID_CHARS = ".,-='/\\!&%():;#${}";
+
+    private PrepareHelper() {
+    }
+
+    /**
+     * Sanitizes the javadoc to removed invalid characters so it can be used as json description
+     *
+     * @param javadoc  the javadoc
+     * @return the text that is valid as json
+     */
+    public static String sanitizeDescription(String javadoc, boolean summary) {
+        if (javadoc == null || javadoc.trim().isEmpty()) {
+            return null;
+        }
+
+        // lets just use what java accepts as identifiers
+        StringBuilder sb = new StringBuilder();
+
+        // split into lines
+        String[] lines = javadoc.split("\n");
+
+        boolean first = true;
+        for (String line : lines) {
+            line = line.trim();
+
+            if (line.startsWith("**")) {
+                continue;
+            }
+            // remove leading javadoc *
+            if (line.startsWith("*")) {
+                line = line.substring(1);
+                line = line.trim();
+            }
+
+            // terminate if we reach @param, @return or @deprecated as we only want the javadoc summary
+            if (line.startsWith("@param") || line.startsWith("@return") || line.startsWith("@deprecated")) {
+                break;
+            }
+
+            // skip lines that are javadoc references
+            if (line.startsWith("@")) {
+                continue;
+            }
+
+            // remove all XML tags
+            line = line.replaceAll("<.*?>", "");
+
+            // remove all inlined javadoc links, eg such as {@link org.apache.camel.spi.Registry}
+            // use #? to remove leading # in case its a local reference
+            line = line.replaceAll("\\{\\@\\w+\\s#?([\\w.#(\\d,)]+)\\}", "$1");
+
+            // we are starting from a new line, so add a whitespace
+            if (!first) {
+                sb.append(' ');
+            }
+
+            // create a new line
+            StringBuilder cb = new StringBuilder();
+            for (char c : line.toCharArray()) {
+                if (Character.isJavaIdentifierPart(c) || VALID_CHARS.indexOf(c) != -1) {
+                    cb.append(c);
+                } else if (Character.isWhitespace(c)) {
+                    // always use space as whitespace, also for line feeds etc
+                    cb.append(' ');
+                }
+            }
+
+            // append data
+            String s = cb.toString().trim();
+            sb.append(s);
+
+            boolean empty = s.isEmpty();
+            boolean endWithDot = s.endsWith(".");
+            boolean haveText = sb.length() > 0;
+
+            if (haveText && summary && (empty || endWithDot)) {
+                // if we only want a summary, then skip at first empty line we encounter, or if the sentence ends with a dot
+                break;
+            }
+
+            first = false;
+        }
+
+        // remove double whitespaces, and trim
+        String s = sb.toString();
+        s = s.replaceAll("\\s+", " ");
+        return s.trim();
+    }
+
+}