CAMEL-10878: Fixed CS and regen docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9bab30ef Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9bab30ef Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9bab30ef Branch: refs/heads/master Commit: 9bab30ef3b3c38df1e530175847f1237fa41806a Parents: bc7c152 Author: Andrea Cosentino <anco...@gmail.com> Authored: Thu Feb 23 13:48:59 2017 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Feb 23 13:49:28 2017 +0100 ---------------------------------------------------------------------- components/camel-http/src/main/docs/http-component.adoc | 2 +- components/camel-http4/src/main/docs/http4-component.adoc | 5 +++-- .../apache/camel/component/http4/helper/HttpMethodHelper.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9bab30ef/components/camel-http/src/main/docs/http-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc index 5cc67ea..b0abe34 100644 --- a/components/camel-http/src/main/docs/http-component.adoc +++ b/components/camel-http/src/main/docs/http-component.adoc @@ -149,7 +149,6 @@ The HTTP component supports 27 endpoint options which are listed below: | Name | Group | Default | Java Type | Description | httpUri | producer | | URI | *Required* The url of the HTTP endpoint to call. | disableStreamCache | common | false | boolean | Determines whether or not the raw input stream from Servlet is cached or not (Camel will read the stream into a in memory/overflow to file Stream caching) cache. By default Camel will cache the Servlet input stream to support reading it multiple times to ensure it Camel can retrieve all data from the stream. However you can set this option to true when you for example need to access the raw stream such as streaming it directly to a file or other persistent store. DefaultHttpBinding will copy the request input stream into a stream cache and put it into message body if this option is false to support reading the stream multiple times. If you use Servlet to bridge/proxy an endpoint then consider enabling this option to improve performance in case you do not need to read the message payload multiple times. The http/http4 producer will by default cache the response body stream. If setting this option to true then the producers will not ca che the response body stream but use the response stream as-is as the message body. -| httpMethod | common | | String | Configure the http Method to use as URI param. In case this is set it can't be overriden by the HttpMethod header. | authMethodPriority | producer | | String | Authentication method for proxy either as Basic Digest or NTLM. | bridgeEndpoint | producer | false | boolean | If the option is true HttpProducer will ignore the Exchange.HTTP_URI header and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back. | chunked | producer | true | boolean | If this option is false the Servlet will disable the HTTP streaming and set the content-length header on the response @@ -158,6 +157,7 @@ The HTTP component supports 27 endpoint options which are listed below: | copyHeaders | producer | true | boolean | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false allows to only include the headers from the HTTP response (not propagating IN headers). | headerFilterStrategy | producer | | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | httpBinding | producer | | HttpBinding | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. +| httpMethod | producer | | String | Configure the http Method to use as URI param. In case this is set it can't be overriden by the HttpMethod header. | ignoreResponseBody | producer | false | boolean | If this option is true The http producer won't read response body and cache the input stream | okStatusCodeRange | producer | 200-299 | String | The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included. | preserveHostHeader | producer | false | boolean | If the option is true HttpProducer will set the Host header to the value contained in the current exchange Host header useful in reverse proxy applications where you want the Host header received by the downstream server to reflect the URL called by the upstream client this allows applications which use the Host header to generate accurate URL's for a proxied service http://git-wip-us.apache.org/repos/asf/camel/blob/9bab30ef/components/camel-http4/src/main/docs/http4-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/docs/http4-component.adoc b/components/camel-http4/src/main/docs/http4-component.adoc index 7c58fd7..dad818b 100644 --- a/components/camel-http4/src/main/docs/http4-component.adoc +++ b/components/camel-http4/src/main/docs/http4-component.adoc @@ -86,7 +86,7 @@ The HTTP4 component supports 13 options which are listed below. // endpoint options: START -The HTTP4 component supports 32 endpoint options which are listed below: +The HTTP4 component supports 33 endpoint options which are listed below: {% raw %} [width="100%",cols="2,1,1m,1m,5",options="header"] @@ -105,6 +105,7 @@ The HTTP4 component supports 32 endpoint options which are listed below: | copyHeaders | producer | true | boolean | If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false allows to only include the headers from the HTTP response (not propagating IN headers). | headerFilterStrategy | producer | | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | httpBinding | producer | | HttpBinding | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. +| httpMethod | producer | | String | Configure the http Method to use as URI param. In case this is set it can't be overriden by the HttpMethod header. | ignoreResponseBody | producer | false | boolean | If this option is true The http producer won't read response body and cache the input stream | okStatusCodeRange | producer | 200-299 | String | The status codes which is considered a success response. The values are inclusive. The range must be defined as from-to with the dash included. | preserveHostHeader | producer | false | boolean | If the option is true HttpProducer will set the Host header to the value contained in the current exchange Host header useful in reverse proxy applications where you want the Host header received by the downstream server to reflect the URL called by the upstream client this allows applications which use the Host header to generate accurate URL's for a proxied service @@ -650,4 +651,4 @@ property. <property name="sslContextParameters" ref="sslContextParams2"/> <property name="x509HostnameVerifier" ref="hostnameVerifier"/> </bean> ----------------------------------------------------------------------------- \ No newline at end of file +---------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9bab30ef/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java index 36714ae..a48ca03 100644 --- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java +++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java @@ -64,7 +64,7 @@ public final class HttpMethodHelper { // compute what method to use either GET or POST HttpMethods answer; if (ObjectHelper.isNotEmpty(endpoint.getHttpMethod())) { - answer = HttpMethods.valueOf(endpoint.getHttpMethod()); + answer = HttpMethods.valueOf(endpoint.getHttpMethod()); } else { HttpMethods m = exchange.getIn().getHeader(Exchange.HTTP_METHOD, HttpMethods.class); if (m != null) {
