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 4c5fcc0d3c68a7f5abfffa2a5b21cf267375ef80 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Sep 2 16:27:45 2019 +0200 Regen --- .../camel-http/src/main/docs/http-component.adoc | 2 +- .../camel-jetty/src/main/docs/jetty-component.adoc | 44 +-- .../src/main/docs/olingo2-component.adoc | 3 +- .../src/main/docs/olingo4-component.adoc | 3 +- components/readme.adoc | 4 +- .../modules/ROOT/pages/csv-dataformat.adoc | 2 +- .../modules/ROOT/pages/facebook-component.adoc | 2 +- .../modules/ROOT/pages/file-component.adoc | 12 +- .../modules/ROOT/pages/hipchat-component.adoc | 2 +- .../modules/ROOT/pages/http-component.adoc | 2 +- .../modules/ROOT/pages/jetty-component.adoc | 44 +-- .../modules/ROOT/pages/linkedin-component.adoc | 2 +- .../modules/ROOT/pages/mail-component.adoc | 6 +- .../modules/ROOT/pages/olingo2-component.adoc | 29 +- .../modules/ROOT/pages/olingo4-component.adoc | 27 +- .../modules/ROOT/pages/rss-component.adoc | 8 +- .../modules/ROOT/pages/rss-dataformat.adoc | 2 +- .../modules/ROOT/pages/tarfile-dataformat.adoc | 4 +- .../modules/ROOT/pages/twilio-component.adoc | 17 +- .../modules/ROOT/pages/zendesk-component.adoc | 17 +- .../modules/ROOT/pages/zipfile-dataformat.adoc | 4 +- .../springboot/HttpComponentConfiguration.java | 32 +- .../JettyHttpComponentConfiguration9.java | 386 ++++++++++----------- 23 files changed, 360 insertions(+), 294 deletions(-) diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc index b577695..42420f2 100644 --- a/components/camel-http/src/main/docs/http-component.adoc +++ b/components/camel-http/src/main/docs/http-component.adoc @@ -65,9 +65,9 @@ The HTTP component supports 18 options, which are listed below. | *connectionRequest Timeout* (timeout) | The timeout in milliseconds used when requesting a connection from the connection manager. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int | *connectTimeout* (timeout) | Determines the timeout in milliseconds until a connection is established. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int | *socketTimeout* (timeout) | Defines the socket timeout (SO_TIMEOUT) in milliseconds, which is the timeout for waiting for data or, put differently, a maximum period inactivity between two consecutive data packets). A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int +| *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean | *httpBinding* (advanced) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | HttpBinding | *httpConfiguration* (advanced) | To use the shared HttpConfiguration as base configuration. | | HttpConfiguration -| *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean |=== diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc index 9c7430e..63ce839 100644 --- a/components/camel-jetty/src/main/docs/jetty-component.adoc +++ b/components/camel-jetty/src/main/docs/jetty-component.adoc @@ -56,36 +56,36 @@ The Jetty component supports 33 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *sslKeyPassword* (security) | The key password, which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option). | | String -| *sslPassword* (security) | The ssl password, which is required to access the keystore file (this is the same password that is supplied to the keystore command's -storepass option). | | String -| *keystore* (security) | Specifies the location of the Java keystore file, which contains the Jetty server's own X.509 certificate in a key entry. | | String -| *errorHandler* (advanced) | This option is used to set the ErrorHandler that Jetty server uses. | | ErrorHandler -| *sslSocketConnectors* (security) | A map which contains per port number specific SSL connectors. | | Map -| *socketConnectors* (security) | A map which contains per port number specific HTTP connectors. Uses the same principle as sslSocketConnectors. | | Map -| *httpClientMinThreads* (producer) | To set a value for minimum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer -| *httpClientMaxThreads* (producer) | To set a value for maximum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer -| *minThreads* (consumer) | To set a value for minimum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer -| *maxThreads* (consumer) | To set a value for maximum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer -| *threadPool* (consumer) | To use a custom thread pool for the server. This option should only be used in special circumstances. | | ThreadPool +| *continuationTimeout* (consumer) | Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine. | 30000 | Long | *enableJmx* (consumer) | If this option is true, Jetty JMX support will be enabled for this endpoint. | false | boolean -| *jettyHttpBinding* (advanced) | To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which are used to customize how a response should be written for the producer. | | JettyHttpBinding +| *errorHandler* (advanced) | This option is used to set the ErrorHandler that Jetty server uses. | | ErrorHandler | *httpBinding* (advanced) | Not to be used - use JettyHttpBinding instead. | | HttpBinding +| *httpClientMaxThreads* (producer) | To set a value for maximum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer +| *httpClientMinThreads* (producer) | To set a value for minimum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer | *httpConfiguration* (advanced) | Jetty component does not use HttpConfiguration. | | HttpConfiguration +| *jettyHttpBinding* (advanced) | To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which are used to customize how a response should be written for the producer. | | JettyHttpBinding +| *keystore* (security) | Specifies the location of the Java keystore file, which contains the Jetty server's own X.509 certificate in a key entry. | | String +| *maxThreads* (consumer) | To set a value for maximum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer | *mbContainer* (advanced) | To use a existing configured org.eclipse.jetty.jmx.MBeanContainer if JMX is enabled that Jetty uses for registering mbeans. | | MBeanContainer -| *sslSocketConnector Properties* (security) | A map which contains general SSL connector properties. | | Map -| *socketConnector Properties* (security) | A map which contains general HTTP connector properties. Uses the same principle as sslSocketConnectorProperties. | | Map -| *continuationTimeout* (consumer) | Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine. | 30000 | Long -| *useContinuation* (consumer) | Whether or not to use Jetty continuations for the Jetty Server. | true | boolean -| *sslContextParameters* (security) | To configure security using SSLContextParameters | | SSLContextParameters -| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters | false | boolean -| *responseBufferSize* (consumer) | Allows to configure a custom value of the response buffer size on the Jetty connectors. | | Integer +| *minThreads* (consumer) | To set a value for minimum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer +| *proxyHost* (proxy) | To use a http proxy to configure the hostname. | | String +| *proxyPort* (proxy) | To use a http proxy to configure the port number. | | Integer | *requestBufferSize* (consumer) | Allows to configure a custom value of the request buffer size on the Jetty connectors. | | Integer | *requestHeaderSize* (consumer) | Allows to configure a custom value of the request header size on the Jetty connectors. | | Integer +| *responseBufferSize* (consumer) | Allows to configure a custom value of the response buffer size on the Jetty connectors. | | Integer | *responseHeaderSize* (consumer) | Allows to configure a custom value of the response header size on the Jetty connectors. | | Integer -| *proxyHost* (proxy) | To use a http proxy to configure the hostname. | | String -| *proxyPort* (proxy) | To use a http proxy to configure the port number. | | Integer -| *useXForwardedFor Header* (consumer) | To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr. | false | boolean | *sendServerVersion* (consumer) | If the option is true, jetty will send the server header with the jetty version information to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port, otherwise this option may not work as expected. | true | boolean +| *socketConnector Properties* (security) | A map which contains general HTTP connector properties. Uses the same principle as sslSocketConnectorProperties. | | Map +| *socketConnectors* (security) | A map which contains per port number specific HTTP connectors. Uses the same principle as sslSocketConnectors. | | Map +| *sslContextParameters* (security) | To configure security using SSLContextParameters | | SSLContextParameters +| *sslKeyPassword* (security) | The key password, which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option). | | String +| *sslPassword* (security) | The ssl password, which is required to access the keystore file (this is the same password that is supplied to the keystore command's -storepass option). | | String +| *sslSocketConnector Properties* (security) | A map which contains general SSL connector properties. | | Map +| *sslSocketConnectors* (security) | A map which contains per port number specific SSL connectors. | | Map +| *threadPool* (consumer) | To use a custom thread pool for the server. This option should only be used in special circumstances. | | ThreadPool +| *useContinuation* (consumer) | Whether or not to use Jetty continuations for the Jetty Server. | true | boolean +| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters | false | boolean +| *useXForwardedFor Header* (consumer) | To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr. | false | boolean | *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc index 7e13c36..9af682a 100644 --- a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc +++ b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc @@ -139,7 +139,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 15 options, which are listed below. +The component supports 16 options, which are listed below. @@ -158,6 +158,7 @@ The component supports 15 options, which are listed below. | *camel.component.olingo2.configuration.proxy* | HTTP proxy server configuration | | HttpHost | *camel.component.olingo2.configuration.service-uri* | Target OData service base URI, e.g. \http://services.odata.org/OData/OData.svc | | String | *camel.component.olingo2.configuration.socket-timeout* | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | Integer +| *camel.component.olingo2.configuration.split-result* | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | Boolean | *camel.component.olingo2.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters | *camel.component.olingo2.enabled* | Enable olingo2 component | true | Boolean | *camel.component.olingo2.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc index 79e2c36..adf3769 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc +++ b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc @@ -140,7 +140,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 15 options, which are listed below. +The component supports 16 options, which are listed below. @@ -159,6 +159,7 @@ The component supports 15 options, which are listed below. | *camel.component.olingo4.configuration.proxy* | HTTP proxy server configuration | | HttpHost | *camel.component.olingo4.configuration.service-uri* | Target OData service base URI, e.g. \http://services.odata.org/OData/OData.svc | | String | *camel.component.olingo4.configuration.socket-timeout* | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | Integer +| *camel.component.olingo4.configuration.split-result* | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | Boolean | *camel.component.olingo4.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters | *camel.component.olingo4.enabled* | Enable olingo4 component | true | Boolean | *camel.component.olingo4.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean diff --git a/components/readme.adoc b/components/readme.adoc index 3638b06..3f536e8 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1053,12 +1053,14 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated) == Miscellaneous Components // others: START -Number of Miscellaneous Components: 34 in 34 JAR artifacts (0 deprecated) +Number of Miscellaneous Components: 35 in 35 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== | Component | Available From | Description +| link:camel-activemq/src/main/docs/activemq.adoc[Activemq] (camel-activemq) | | ActiveMQ component for Camel + | link:camel-attachments/src/main/docs/attachments.adoc[Attachments] (camel-attachments) | 3.0 | Java Attachments support for Camel Message | link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] (camel-blueprint) | 2.4 | Using Camel with OSGi Blueprint diff --git a/docs/components/modules/ROOT/pages/csv-dataformat.adoc b/docs/components/modules/ROOT/pages/csv-dataformat.adoc index b3265f3..8a96562 100644 --- a/docs/components/modules/ROOT/pages/csv-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/csv-dataformat.adoc @@ -220,7 +220,7 @@ public void doHandleCsvData(List<List<String>> csvData) ------------------------------------------------------------------------------------------------ <route> <!-- poll every 10 seconds --> - <from uri="file:///some/path/to/pickup/csvfiles?delete=true&consumer.delay=10000" /> + <from uri="file:///some/path/to/pickup/csvfiles?delete=true&delay=10000" /> <unmarshal><csv /></unmarshal> <to uri="bean:myCsvHandler?method=doHandleCsvData" /> </route> diff --git a/docs/components/modules/ROOT/pages/facebook-component.adoc b/docs/components/modules/ROOT/pages/facebook-component.adoc index 8a224c9..119d30e 100644 --- a/docs/components/modules/ROOT/pages/facebook-component.adoc +++ b/docs/components/modules/ROOT/pages/facebook-component.adoc @@ -352,7 +352,7 @@ your home feed: [source,java] ----------------------------------------------- - from("facebook://home?consumer.delay=5000") + from("facebook://home?delay=5000") .to("bean:blah"); ----------------------------------------------- diff --git a/docs/components/modules/ROOT/pages/file-component.adoc b/docs/components/modules/ROOT/pages/file-component.adoc index d9b4991..6735a76 100644 --- a/docs/components/modules/ROOT/pages/file-component.adoc +++ b/docs/components/modules/ROOT/pages/file-component.adoc @@ -1129,13 +1129,11 @@ directories, to avoid traversing down unwanted directories. For example to skip any directories which starts with `"skip"` in the name, can be implemented as follows: -== Using consumer.bridgeErrorHandler - -*Available as of Camel 2.10* +== Using bridgeErrorHandler If you want to use the Camel Error Handler to deal with any exception occurring in the file consumer, then you can -enable the `consumer.bridgeErrorHandler` option as shown below: +enable the `bridgeErrorHandler` option as shown below: [source,java] ---- @@ -1148,7 +1146,7 @@ onException(IOException.class) // this is the file route that pickup files, notice how we bridge the consumer to use the Camel routing error handler // the exclusiveReadLockStrategy is only configured because this is from an unit test, so we use that to simulate exceptions -from("file:target/nospace?consumer.bridgeErrorHandler=true") +from("file:target/nospace?bridgeErrorHandler=true") .convertBodyTo(String.class) .to("mock:result"); ---- @@ -1156,8 +1154,8 @@ from("file:target/nospace?consumer.bridgeErrorHandler=true") So all you have to do is to enable this option, and the error handler in the route will take it from there. -IMPORTANT: *Important when using consumer.bridgeErrorHandler* -When using consumer.bridgeErrorHandler, then +IMPORTANT: *Important when using bridgeErrorHandler* +When using bridgeErrorHandler, then interceptors, OnCompletions does *not* apply. The Exchange is processed directly by the Camel Error Handler, and does not allow diff --git a/docs/components/modules/ROOT/pages/hipchat-component.adoc b/docs/components/modules/ROOT/pages/hipchat-component.adoc index 755a76c..a2d3bda 100644 --- a/docs/components/modules/ROOT/pages/hipchat-component.adoc +++ b/docs/components/modules/ROOT/pages/hipchat-component.adoc @@ -85,7 +85,7 @@ with the following path and query parameters: | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int -| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long +| *delay* (scheduler) | Milliseconds before the next poll. | 5000 | long | *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean | *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel diff --git a/docs/components/modules/ROOT/pages/http-component.adoc b/docs/components/modules/ROOT/pages/http-component.adoc index 34c3651..e2939d6 100644 --- a/docs/components/modules/ROOT/pages/http-component.adoc +++ b/docs/components/modules/ROOT/pages/http-component.adoc @@ -66,9 +66,9 @@ The HTTP component supports 18 options, which are listed below. | *connectionRequest Timeout* (timeout) | The timeout in milliseconds used when requesting a connection from the connection manager. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int | *connectTimeout* (timeout) | Determines the timeout in milliseconds until a connection is established. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int | *socketTimeout* (timeout) | Defines the socket timeout (SO_TIMEOUT) in milliseconds, which is the timeout for waiting for data or, put differently, a maximum period inactivity between two consecutive data packets). A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | int +| *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean | *httpBinding* (advanced) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | HttpBinding | *httpConfiguration* (advanced) | To use the shared HttpConfiguration as base configuration. | | HttpConfiguration -| *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean |=== diff --git a/docs/components/modules/ROOT/pages/jetty-component.adoc b/docs/components/modules/ROOT/pages/jetty-component.adoc index aa0a5aa..f3776d4 100644 --- a/docs/components/modules/ROOT/pages/jetty-component.adoc +++ b/docs/components/modules/ROOT/pages/jetty-component.adoc @@ -57,36 +57,36 @@ The Jetty component supports 33 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *sslKeyPassword* (security) | The key password, which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option). | | String -| *sslPassword* (security) | The ssl password, which is required to access the keystore file (this is the same password that is supplied to the keystore command's -storepass option). | | String -| *keystore* (security) | Specifies the location of the Java keystore file, which contains the Jetty server's own X.509 certificate in a key entry. | | String -| *errorHandler* (advanced) | This option is used to set the ErrorHandler that Jetty server uses. | | ErrorHandler -| *sslSocketConnectors* (security) | A map which contains per port number specific SSL connectors. | | Map -| *socketConnectors* (security) | A map which contains per port number specific HTTP connectors. Uses the same principle as sslSocketConnectors. | | Map -| *httpClientMinThreads* (producer) | To set a value for minimum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer -| *httpClientMaxThreads* (producer) | To set a value for maximum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer -| *minThreads* (consumer) | To set a value for minimum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer -| *maxThreads* (consumer) | To set a value for maximum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer -| *threadPool* (consumer) | To use a custom thread pool for the server. This option should only be used in special circumstances. | | ThreadPool +| *continuationTimeout* (consumer) | Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine. | 30000 | Long | *enableJmx* (consumer) | If this option is true, Jetty JMX support will be enabled for this endpoint. | false | boolean -| *jettyHttpBinding* (advanced) | To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which are used to customize how a response should be written for the producer. | | JettyHttpBinding +| *errorHandler* (advanced) | This option is used to set the ErrorHandler that Jetty server uses. | | ErrorHandler | *httpBinding* (advanced) | Not to be used - use JettyHttpBinding instead. | | HttpBinding +| *httpClientMaxThreads* (producer) | To set a value for maximum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer +| *httpClientMinThreads* (producer) | To set a value for minimum number of threads in HttpClient thread pool. Notice that both a min and max size must be configured. | | Integer | *httpConfiguration* (advanced) | Jetty component does not use HttpConfiguration. | | HttpConfiguration +| *jettyHttpBinding* (advanced) | To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which are used to customize how a response should be written for the producer. | | JettyHttpBinding +| *keystore* (security) | Specifies the location of the Java keystore file, which contains the Jetty server's own X.509 certificate in a key entry. | | String +| *maxThreads* (consumer) | To set a value for maximum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer | *mbContainer* (advanced) | To use a existing configured org.eclipse.jetty.jmx.MBeanContainer if JMX is enabled that Jetty uses for registering mbeans. | | MBeanContainer -| *sslSocketConnector Properties* (security) | A map which contains general SSL connector properties. | | Map -| *socketConnector Properties* (security) | A map which contains general HTTP connector properties. Uses the same principle as sslSocketConnectorProperties. | | Map -| *continuationTimeout* (consumer) | Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine. | 30000 | Long -| *useContinuation* (consumer) | Whether or not to use Jetty continuations for the Jetty Server. | true | boolean -| *sslContextParameters* (security) | To configure security using SSLContextParameters | | SSLContextParameters -| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters | false | boolean -| *responseBufferSize* (consumer) | Allows to configure a custom value of the response buffer size on the Jetty connectors. | | Integer +| *minThreads* (consumer) | To set a value for minimum number of threads in server thread pool. Notice that both a min and max size must be configured. | | Integer +| *proxyHost* (proxy) | To use a http proxy to configure the hostname. | | String +| *proxyPort* (proxy) | To use a http proxy to configure the port number. | | Integer | *requestBufferSize* (consumer) | Allows to configure a custom value of the request buffer size on the Jetty connectors. | | Integer | *requestHeaderSize* (consumer) | Allows to configure a custom value of the request header size on the Jetty connectors. | | Integer +| *responseBufferSize* (consumer) | Allows to configure a custom value of the response buffer size on the Jetty connectors. | | Integer | *responseHeaderSize* (consumer) | Allows to configure a custom value of the response header size on the Jetty connectors. | | Integer -| *proxyHost* (proxy) | To use a http proxy to configure the hostname. | | String -| *proxyPort* (proxy) | To use a http proxy to configure the port number. | | Integer -| *useXForwardedFor Header* (consumer) | To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr. | false | boolean | *sendServerVersion* (consumer) | If the option is true, jetty will send the server header with the jetty version information to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port, otherwise this option may not work as expected. | true | boolean +| *socketConnector Properties* (security) | A map which contains general HTTP connector properties. Uses the same principle as sslSocketConnectorProperties. | | Map +| *socketConnectors* (security) | A map which contains per port number specific HTTP connectors. Uses the same principle as sslSocketConnectors. | | Map +| *sslContextParameters* (security) | To configure security using SSLContextParameters | | SSLContextParameters +| *sslKeyPassword* (security) | The key password, which is used to access the certificate's key entry in the keystore (this is the same password that is supplied to the keystore command's -keypass option). | | String +| *sslPassword* (security) | The ssl password, which is required to access the keystore file (this is the same password that is supplied to the keystore command's -storepass option). | | String +| *sslSocketConnector Properties* (security) | A map which contains general SSL connector properties. | | Map +| *sslSocketConnectors* (security) | A map which contains per port number specific SSL connectors. | | Map +| *threadPool* (consumer) | To use a custom thread pool for the server. This option should only be used in special circumstances. | | ThreadPool +| *useContinuation* (consumer) | Whether or not to use Jetty continuations for the Jetty Server. | true | boolean +| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters | false | boolean +| *useXForwardedFor Header* (consumer) | To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr. | false | boolean | *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean diff --git a/docs/components/modules/ROOT/pages/linkedin-component.adoc b/docs/components/modules/ROOT/pages/linkedin-component.adoc index 30038f5..c15d632 100644 --- a/docs/components/modules/ROOT/pages/linkedin-component.adoc +++ b/docs/components/modules/ROOT/pages/linkedin-component.adoc @@ -715,7 +715,7 @@ The following route polls user's connections every 30 seconds: [source,java] ------------------------------------------------------------------------------------- - from("linkedin://people/connections?consumer.timeUnit=SECONDS&consumer.delay=30") + from("linkedin://people/connections?consumer.timeUnit=SECONDS&delay=30") .to("bean:foo"); ------------------------------------------------------------------------------------- diff --git a/docs/components/modules/ROOT/pages/mail-component.adoc b/docs/components/modules/ROOT/pages/mail-component.adoc index 09008da..a995f69 100644 --- a/docs/components/modules/ROOT/pages/mail-component.adoc +++ b/docs/components/modules/ROOT/pages/mail-component.adoc @@ -501,7 +501,7 @@ interval, `consumer.delay`, as 60000 milliseconds = 60 seconds. [source,java] ------------------------------------------------------- from("imap://[email protected] - password=secret&unseen=true&consumer.delay=60000") + password=secret&unseen=true&delay=60000") .to("seda://mails"); ------------------------------------------------------- @@ -538,7 +538,7 @@ extensive documentation on how to do this. [source,java] ------------------------------------------------------------------------------------- from("imaps://[email protected]&password=YOUR_PASSWORD" - + "&delete=false&unseen=true&consumer.delay=60000").to("log:newmail"); + + "&delete=false&unseen=true&delay=60000").to("log:newmail"); ------------------------------------------------------------------------------------- The preceding route polls the Google mail inbox for new mails once every @@ -566,7 +566,7 @@ SSL sample: [source,java] --------------------------------------------------------------------------------------- from("imaps://[email protected]&password=YOUR_PASSWORD" - + "&delete=false&unseen=true&consumer.delay=60000").process(new MyMailProcessor()); + + "&delete=false&unseen=true&delay=60000").process(new MyMailProcessor()); --------------------------------------------------------------------------------------- Instead of logging the mail we use a processor where we can process the diff --git a/docs/components/modules/ROOT/pages/olingo2-component.adoc b/docs/components/modules/ROOT/pages/olingo2-component.adoc index f7cb154..664d29f 100644 --- a/docs/components/modules/ROOT/pages/olingo2-component.adoc +++ b/docs/components/modules/ROOT/pages/olingo2-component.adoc @@ -83,7 +83,7 @@ with the following path and query parameters: |=== -=== Query Parameters (17 parameters): +=== Query Parameters (33 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -101,11 +101,27 @@ with the following path and query parameters: | *socketTimeout* (common) | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | int | *sslContextParameters* (common) | To configure security using SSLContextParameters | | SSLContextParameters | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean +| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean +| *splitResult* (consumer) | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | boolean | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern +| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean +| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int +| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int +| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int +| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long +| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean +| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long +| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel +| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service +| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String +| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map +| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean +| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit +| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean |=== // endpoint options: END // spring-boot-auto-configure options: START @@ -124,7 +140,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 15 options, which are listed below. +The component supports 16 options, which are listed below. @@ -143,6 +159,7 @@ The component supports 15 options, which are listed below. | *camel.component.olingo2.configuration.proxy* | HTTP proxy server configuration | | HttpHost | *camel.component.olingo2.configuration.service-uri* | Target OData service base URI, e.g. \http://services.odata.org/OData/OData.svc | | String | *camel.component.olingo2.configuration.socket-timeout* | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | Integer +| *camel.component.olingo2.configuration.split-result* | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | Boolean | *camel.component.olingo2.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters | *camel.component.olingo2.enabled* | Enable olingo2 component | true | Boolean | *camel.component.olingo2.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean @@ -255,11 +272,11 @@ java.util.List<java.util.Map<String, Object>> containing list of key property na Only the *read* endpoint can be used as a consumer endpoint. Consumer endpoints can use http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled -Poll Consumer Options] with a *`consumer.`* prefix to schedule endpoint +Poll Consumer Options] to schedule endpoint invocation. By default consumer endpoints that return an array or collection will generate one exchange per element, and their routes will be executed once for each exchange. This behavior can be disabled by -setting the endpoint property *consumer.splitResult=false*. +setting the endpoint property *splitResult=false*. == Message Headers @@ -274,7 +291,7 @@ API] used by the Olingo2Component. Producer endpoints can specify the option name for incoming message body in the *`inBody`* endpoint URI parameter. For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless -*consumer.splitResult* is set to *false*. +*splitResult* is set to *false*. == Use cases @@ -331,6 +348,6 @@ consumer endpoint will produce an *ODataFeed* value the first time, and [source,java] --------------------------------------------------------------------------------------------------------- -from("olingo2://read/Manufacturers?queryParams=#paramsBean&consumer.timeUnit=SECONDS&consumer.delay=30") +from("olingo2://read/Manufacturers?queryParams=#paramsBean&timeUnit=SECONDS&delay=30") .to("bean:blah"); --------------------------------------------------------------------------------------------------------- diff --git a/docs/components/modules/ROOT/pages/olingo4-component.adoc b/docs/components/modules/ROOT/pages/olingo4-component.adoc index c380d8a..7e6eadf 100644 --- a/docs/components/modules/ROOT/pages/olingo4-component.adoc +++ b/docs/components/modules/ROOT/pages/olingo4-component.adoc @@ -84,7 +84,7 @@ with the following path and query parameters: |=== -=== Query Parameters (17 parameters): +=== Query Parameters (33 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -102,11 +102,27 @@ with the following path and query parameters: | *socketTimeout* (common) | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | int | *sslContextParameters* (common) | To configure security using SSLContextParameters | | SSLContextParameters | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean +| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean +| *splitResult* (consumer) | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | boolean | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern +| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean +| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int +| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int +| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int +| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long +| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean +| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long +| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel +| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service +| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String +| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map +| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean +| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit +| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean |=== // endpoint options: END // spring-boot-auto-configure options: START @@ -125,7 +141,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- -The component supports 15 options, which are listed below. +The component supports 16 options, which are listed below. @@ -144,6 +160,7 @@ The component supports 15 options, which are listed below. | *camel.component.olingo4.configuration.proxy* | HTTP proxy server configuration | | HttpHost | *camel.component.olingo4.configuration.service-uri* | Target OData service base URI, e.g. \http://services.odata.org/OData/OData.svc | | String | *camel.component.olingo4.configuration.socket-timeout* | HTTP request timeout in milliseconds, defaults to 30,000 (30 seconds) | 30000 | Integer +| *camel.component.olingo4.configuration.split-result* | For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless splitResult is set to false. | true | Boolean | *camel.component.olingo4.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters | *camel.component.olingo4.enabled* | Enable olingo4 component | true | Boolean | *camel.component.olingo4.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean @@ -238,11 +255,11 @@ java.util.Map<String, Object> for In body (request) Only the *read* endpoint can be used as a consumer endpoint. Consumer endpoints can use http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled -Poll Consumer Options] with a *`consumer.`* prefix to schedule endpoint +Poll Consumer Options] to schedule endpoint invocation. By default consumer endpoints that return an array or collection will generate one exchange per element, and their routes will be executed once for each exchange. This behavior can be disabled by -setting the endpoint property *consumer.splitResult=false*. +setting the endpoint property *splitResult=false*. == Message Headers @@ -257,7 +274,7 @@ API] used by the Olingo4Component. Producer endpoints can specify the option name for incoming message body in the *`inBody`* endpoint URI parameter. For endpoints that return an array or collection, a consumer endpoint will map every element to distinct messages, unless -*consumer.splitResult* is set to *false*. +*splitResult* is set to *false*. == Use cases diff --git a/docs/components/modules/ROOT/pages/rss-component.adoc b/docs/components/modules/ROOT/pages/rss-component.adoc index 7fda8ad..d850341 100644 --- a/docs/components/modules/ROOT/pages/rss-component.adoc +++ b/docs/components/modules/ROOT/pages/rss-component.adoc @@ -177,18 +177,18 @@ convert between String (as XML) and ROME RSS model objects. * unmarshal = from XML `String` to ROME `SyndFeed` A route using the RSS dataformat will look like this: -`from("rss:file:src/test/data/rss20.xml?splitEntries=false&consumer.delay=1000").marshal().rss().to("mock:marshal");` +`from("rss:file:src/test/data/rss20.xml?splitEntries=false&delay=1000").marshal().rss().to("mock:marshal");` The purpose of this feature is to make it possible to use Camel's built-in expressions for manipulating RSS messages. As shown below, an XPath expression can be used to filter the RSS message. In the following example, on ly entries with Camel in the title will get through the filter. - `from("rss:file:src/test/data/rss20.xml?splitEntries=true&consumer.delay=100").marshal().rss().filter().xpath("//item/title[contains(.,'Camel')]").to("mock:result");` + `from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=100").marshal().rss().filter().xpath("//item/title[contains(.,'Camel')]").to("mock:result");` TIP: *Query parameters* If the URL for the RSS feed uses query parameters, this component will resolve them. For example if the feed uses `alt=rss`, then the following example will be resolved: -`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&consumer.delay=1000";).to("bean:rss");` +`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&delay=1000";).to("bean:rss");` == Filtering entries @@ -198,7 +198,7 @@ Bean Integration to implement your own conditions. For instance, a filter equivalent to the XPath example above would be: -`from("rss:file:src/test/data/rss20.xml?splitEntries=true&consumer.delay=100"). +`from("rss:file:src/test/data/rss20.xml?splitEntries=true&delay=100"). filter().method("myFilterBean", "titleContainsCamel").to("mock:result");` The custom bean for this would be: diff --git a/docs/components/modules/ROOT/pages/rss-dataformat.adoc b/docs/components/modules/ROOT/pages/rss-dataformat.adoc index 9ce6336..08a00c4 100644 --- a/docs/components/modules/ROOT/pages/rss-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/rss-dataformat.adoc @@ -20,7 +20,7 @@ TIP: *Query parameters* If the URL for the RSS feed uses query parameters, this component will understand them as well, for example if the feed uses `alt=rss`, then you can for example do -`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&consumer.delay=1000";).to("bean:rss");` +`from("rss:http://someserver.com/feeds/posts/default?alt=rss&splitEntries=false&delay=1000";).to("bean:rss");` == Options diff --git a/docs/components/modules/ROOT/pages/tarfile-dataformat.adoc b/docs/components/modules/ROOT/pages/tarfile-dataformat.adoc index 15a2e0a..fcb9c31 100644 --- a/docs/components/modules/ROOT/pages/tarfile-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/tarfile-dataformat.adoc @@ -121,7 +121,7 @@ work. ---------------------------------------------------------------------------------------------------- TarFileDataFormat tarFile = new TarFileDataFormat(); tarFile.setUsingIterator(true); - from("file:src/test/resources/org/apache/camel/dataformat/tarfile/?consumer.delay=1000&noop=true") + from("file:src/test/resources/org/apache/camel/dataformat/tarfile/?delay=1000&noop=true") .unmarshal(tarFile) .split(body(Iterator.class)) .streaming() @@ -134,7 +134,7 @@ like this [source,java] ---------------------------------------------------------------------------------------------------- - from("file:src/test/resources/org/apache/camel/dataformat/tarfile?consumer.delay=1000&noop=true") + from("file:src/test/resources/org/apache/camel/dataformat/tarfile?delay=1000&noop=true") .split(new TarSplitter()) .streaming() .process(new UnTarpedMessageProcessor()) diff --git a/docs/components/modules/ROOT/pages/twilio-component.adoc b/docs/components/modules/ROOT/pages/twilio-component.adoc index fe81a0a..ce64a4b 100644 --- a/docs/components/modules/ROOT/pages/twilio-component.adoc +++ b/docs/components/modules/ROOT/pages/twilio-component.adoc @@ -59,7 +59,7 @@ with the following path and query parameters: |=== -=== Query Parameters (7 parameters): +=== Query Parameters (22 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -67,11 +67,26 @@ with the following path and query parameters: | Name | Description | Default | Type | *inBody* (common) | Sets the name of a parameter to be passed in the exchange In Body | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean +| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern +| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean +| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int +| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int +| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int +| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long +| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean +| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long +| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel +| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service +| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String +| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map +| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean +| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit +| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean |=== // endpoint options: END // spring-boot-auto-configure options: START diff --git a/docs/components/modules/ROOT/pages/zendesk-component.adoc b/docs/components/modules/ROOT/pages/zendesk-component.adoc index 4d36374..9076f4f 100644 --- a/docs/components/modules/ROOT/pages/zendesk-component.adoc +++ b/docs/components/modules/ROOT/pages/zendesk-component.adoc @@ -55,7 +55,7 @@ with the following path and query parameters: |=== -=== Query Parameters (12 parameters): +=== Query Parameters (27 parameters): [width="100%",cols="2,5,^1,2",options="header"] @@ -64,11 +64,26 @@ with the following path and query parameters: | *inBody* (common) | Sets the name of a parameter to be passed in the exchange In Body | | String | *serverUrl* (common) | The server URL to connect. | | String | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean +| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern +| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. | | PollingConsumerPoll Strategy | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...] | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean +| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. | | int +| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. | | int +| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. | | int +| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long +| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean +| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long +| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel +| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. | | ScheduledExecutor Service +| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component | none | String +| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. | | Map +| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean +| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit +| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean | *oauthToken* (security) | The OAuth token. | | String | *password* (security) | The password. | | String | *token* (security) | The security token. | | String diff --git a/docs/components/modules/ROOT/pages/zipfile-dataformat.adoc b/docs/components/modules/ROOT/pages/zipfile-dataformat.adoc index d8af1cc..48e7a55 100644 --- a/docs/components/modules/ROOT/pages/zipfile-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/zipfile-dataformat.adoc @@ -128,7 +128,7 @@ work. ZipFileDataFormat zipFile = new ZipFileDataFormat(); zipFile.setUsingIterator(true); -from("file:src/test/resources/org/apache/camel/dataformat/zipfile/?consumer.delay=1000&noop=true") +from("file:src/test/resources/org/apache/camel/dataformat/zipfile/?delay=1000&noop=true") .unmarshal(zipFile) .split(body(Iterator.class)).streaming() .process(new UnZippedMessageProcessor()) @@ -140,7 +140,7 @@ like this [source,java] ---- -from("file:src/test/resources/org/apache/camel/dataformat/zipfile?consumer.delay=1000&noop=true") +from("file:src/test/resources/org/apache/camel/dataformat/zipfile?delay=1000&noop=true") .split(new ZipSplitter()).streaming() .process(new UnZippedMessageProcessor()) .end(); diff --git a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java index 3aee84f..2d100d0 100644 --- a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java @@ -117,6 +117,14 @@ public class HttpComponentConfiguration */ private Integer socketTimeout = -1; /** + * Whether to allow java serialization when a request uses + * context-type=application/x-java-serialized-object. This is by default + * turned off. If you enable this then be aware that Java will deserialize + * the incoming data from the request to Java and that can be a potential + * security risk. + */ + private Boolean allowJavaSerializedObject = false; + /** * To use a custom HttpBinding to control the mapping between Camel message * and HttpClient. The option is a org.apache.camel.http.common.HttpBinding * type. @@ -128,14 +136,6 @@ public class HttpComponentConfiguration */ private String httpConfiguration; /** - * Whether to allow java serialization when a request uses - * context-type=application/x-java-serialized-object. This is by default - * turned off. If you enable this then be aware that Java will deserialize - * the incoming data from the request to Java and that can be a potential - * security risk. - */ - private Boolean allowJavaSerializedObject = false; - /** * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter * header to and from Camel message. The option is a * org.apache.camel.spi.HeaderFilterStrategy type. @@ -252,6 +252,14 @@ public class HttpComponentConfiguration this.socketTimeout = socketTimeout; } + public Boolean getAllowJavaSerializedObject() { + return allowJavaSerializedObject; + } + + public void setAllowJavaSerializedObject(Boolean allowJavaSerializedObject) { + this.allowJavaSerializedObject = allowJavaSerializedObject; + } + public String getHttpBinding() { return httpBinding; } @@ -268,14 +276,6 @@ public class HttpComponentConfiguration this.httpConfiguration = httpConfiguration; } - public Boolean getAllowJavaSerializedObject() { - return allowJavaSerializedObject; - } - - public void setAllowJavaSerializedObject(Boolean allowJavaSerializedObject) { - this.allowJavaSerializedObject = allowJavaSerializedObject; - } - public String getHeaderFilterStrategy() { return headerFilterStrategy; } diff --git a/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java b/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java index e135dd9..ac7e5ee 100644 --- a/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java +++ b/platforms/spring-boot/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java @@ -40,159 +40,159 @@ public class JettyHttpComponentConfiguration9 */ private Boolean enabled; /** - * The key password, which is used to access the certificate's key entry in - * the keystore (this is the same password that is supplied to the keystore - * command's -keypass option). - */ - private String sslKeyPassword; - /** - * The ssl password, which is required to access the keystore file (this is - * the same password that is supplied to the keystore command's -storepass - * option). + * Allows to set a timeout in millis when using Jetty as consumer (server). + * By default Jetty uses 30000. You can use a value of = 0 to never expire. + * If a timeout occurs then the request will be expired and Jetty will + * return back a http error 503 to the client. This option is only in use + * when using Jetty with the Asynchronous Routing Engine. */ - private String sslPassword; + private Long continuationTimeout = 30000L; /** - * Specifies the location of the Java keystore file, which contains the - * Jetty server's own X.509 certificate in a key entry. + * If this option is true, Jetty JMX support will be enabled for this + * endpoint. */ - private String keystore; + private Boolean enableJmx = false; /** * This option is used to set the ErrorHandler that Jetty server uses. The * option is a org.eclipse.jetty.server.handler.ErrorHandler type. */ private String errorHandler; /** - * A map which contains per port number specific SSL connectors. + * Not to be used - use JettyHttpBinding instead. The option is a + * org.apache.camel.http.common.HttpBinding type. */ - private Map<Integer, Connector> sslSocketConnectors; + private String httpBinding; /** - * A map which contains per port number specific HTTP connectors. Uses the - * same principle as sslSocketConnectors. + * To set a value for maximum number of threads in HttpClient thread pool. + * Notice that both a min and max size must be configured. */ - private Map<Integer, Connector> socketConnectors; + private Integer httpClientMaxThreads; /** * To set a value for minimum number of threads in HttpClient thread pool. * Notice that both a min and max size must be configured. */ private Integer httpClientMinThreads; /** - * To set a value for maximum number of threads in HttpClient thread pool. - * Notice that both a min and max size must be configured. + * Jetty component does not use HttpConfiguration. The option is a + * org.apache.camel.http.common.HttpConfiguration type. */ - private Integer httpClientMaxThreads; + private String httpConfiguration; /** - * To set a value for minimum number of threads in server thread pool. - * Notice that both a min and max size must be configured. + * To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which + * are used to customize how a response should be written for the producer. + * The option is a org.apache.camel.component.jetty.JettyHttpBinding type. */ - private Integer minThreads; + private String jettyHttpBinding; + /** + * Specifies the location of the Java keystore file, which contains the + * Jetty server's own X.509 certificate in a key entry. + */ + private String keystore; /** * To set a value for maximum number of threads in server thread pool. * Notice that both a min and max size must be configured. */ private Integer maxThreads; /** - * To use a custom thread pool for the server. This option should only be - * used in special circumstances. The option is a - * org.eclipse.jetty.util.thread.ThreadPool type. + * To use a existing configured org.eclipse.jetty.jmx.MBeanContainer if JMX + * is enabled that Jetty uses for registering mbeans. The option is a + * org.eclipse.jetty.jmx.MBeanContainer type. */ - private String threadPool; + private String mbContainer; /** - * If this option is true, Jetty JMX support will be enabled for this - * endpoint. + * To set a value for minimum number of threads in server thread pool. + * Notice that both a min and max size must be configured. */ - private Boolean enableJmx = false; + private Integer minThreads; /** - * To use a custom org.apache.camel.component.jetty.JettyHttpBinding, which - * are used to customize how a response should be written for the producer. - * The option is a org.apache.camel.component.jetty.JettyHttpBinding type. + * To use a http proxy to configure the hostname. */ - private String jettyHttpBinding; + private String proxyHost; /** - * Not to be used - use JettyHttpBinding instead. The option is a - * org.apache.camel.http.common.HttpBinding type. + * To use a http proxy to configure the port number. */ - private String httpBinding; + private Integer proxyPort; /** - * Jetty component does not use HttpConfiguration. The option is a - * org.apache.camel.http.common.HttpConfiguration type. + * Allows to configure a custom value of the request buffer size on the + * Jetty connectors. */ - private String httpConfiguration; + private Integer requestBufferSize; /** - * To use a existing configured org.eclipse.jetty.jmx.MBeanContainer if JMX - * is enabled that Jetty uses for registering mbeans. The option is a - * org.eclipse.jetty.jmx.MBeanContainer type. + * Allows to configure a custom value of the request header size on the + * Jetty connectors. */ - private String mbContainer; + private Integer requestHeaderSize; /** - * A map which contains general SSL connector properties. + * Allows to configure a custom value of the response buffer size on the + * Jetty connectors. */ - private Map<String, Object> sslSocketConnectorProperties; + private Integer responseBufferSize; + /** + * Allows to configure a custom value of the response header size on the + * Jetty connectors. + */ + private Integer responseHeaderSize; + /** + * If the option is true, jetty will send the server header with the jetty + * version information to the client which sends the request. NOTE please + * make sure there is no any other camel-jetty endpoint is share the same + * port, otherwise this option may not work as expected. + */ + private Boolean sendServerVersion = true; /** * A map which contains general HTTP connector properties. Uses the same * principle as sslSocketConnectorProperties. */ private Map<String, Object> socketConnectorProperties; /** - * Allows to set a timeout in millis when using Jetty as consumer (server). - * By default Jetty uses 30000. You can use a value of = 0 to never expire. - * If a timeout occurs then the request will be expired and Jetty will - * return back a http error 503 to the client. This option is only in use - * when using Jetty with the Asynchronous Routing Engine. - */ - private Long continuationTimeout = 30000L; - /** - * Whether or not to use Jetty continuations for the Jetty Server. + * A map which contains per port number specific HTTP connectors. Uses the + * same principle as sslSocketConnectors. */ - private Boolean useContinuation = true; + private Map<Integer, Connector> socketConnectors; /** * To configure security using SSLContextParameters. The option is a * org.apache.camel.support.jsse.SSLContextParameters type. */ private String sslContextParameters; /** - * Enable usage of global SSL context parameters + * The key password, which is used to access the certificate's key entry in + * the keystore (this is the same password that is supplied to the keystore + * command's -keypass option). */ - private Boolean useGlobalSslContextParameters = false; + private String sslKeyPassword; /** - * Allows to configure a custom value of the response buffer size on the - * Jetty connectors. + * The ssl password, which is required to access the keystore file (this is + * the same password that is supplied to the keystore command's -storepass + * option). */ - private Integer responseBufferSize; + private String sslPassword; /** - * Allows to configure a custom value of the request buffer size on the - * Jetty connectors. + * A map which contains general SSL connector properties. */ - private Integer requestBufferSize; + private Map<String, Object> sslSocketConnectorProperties; /** - * Allows to configure a custom value of the request header size on the - * Jetty connectors. + * A map which contains per port number specific SSL connectors. */ - private Integer requestHeaderSize; + private Map<Integer, Connector> sslSocketConnectors; /** - * Allows to configure a custom value of the response header size on the - * Jetty connectors. + * To use a custom thread pool for the server. This option should only be + * used in special circumstances. The option is a + * org.eclipse.jetty.util.thread.ThreadPool type. */ - private Integer responseHeaderSize; + private String threadPool; /** - * To use a http proxy to configure the hostname. + * Whether or not to use Jetty continuations for the Jetty Server. */ - private String proxyHost; + private Boolean useContinuation = true; /** - * To use a http proxy to configure the port number. + * Enable usage of global SSL context parameters */ - private Integer proxyPort; + private Boolean useGlobalSslContextParameters = false; /** * To use the X-Forwarded-For header in HttpServletRequest.getRemoteAddr. */ private Boolean useXForwardedForHeader = false; /** - * If the option is true, jetty will send the server header with the jetty - * version information to the client which sends the request. NOTE please - * make sure there is no any other camel-jetty endpoint is share the same - * port, otherwise this option may not work as expected. - */ - private Boolean sendServerVersion = true; - /** * Whether to allow java serialization when a request uses * context-type=application/x-java-serialized-object. This is by default * turned off. If you enable this then be aware that Java will deserialize @@ -212,28 +212,20 @@ public class JettyHttpComponentConfiguration9 */ private Boolean basicPropertyBinding = false; - public String getSslKeyPassword() { - return sslKeyPassword; - } - - public void setSslKeyPassword(String sslKeyPassword) { - this.sslKeyPassword = sslKeyPassword; - } - - public String getSslPassword() { - return sslPassword; + public Long getContinuationTimeout() { + return continuationTimeout; } - public void setSslPassword(String sslPassword) { - this.sslPassword = sslPassword; + public void setContinuationTimeout(Long continuationTimeout) { + this.continuationTimeout = continuationTimeout; } - public String getKeystore() { - return keystore; + public Boolean getEnableJmx() { + return enableJmx; } - public void setKeystore(String keystore) { - this.keystore = keystore; + public void setEnableJmx(Boolean enableJmx) { + this.enableJmx = enableJmx; } public String getErrorHandler() { @@ -244,21 +236,20 @@ public class JettyHttpComponentConfiguration9 this.errorHandler = errorHandler; } - public Map<Integer, Connector> getSslSocketConnectors() { - return sslSocketConnectors; + public String getHttpBinding() { + return httpBinding; } - public void setSslSocketConnectors( - Map<Integer, Connector> sslSocketConnectors) { - this.sslSocketConnectors = sslSocketConnectors; + public void setHttpBinding(String httpBinding) { + this.httpBinding = httpBinding; } - public Map<Integer, Connector> getSocketConnectors() { - return socketConnectors; + public Integer getHttpClientMaxThreads() { + return httpClientMaxThreads; } - public void setSocketConnectors(Map<Integer, Connector> socketConnectors) { - this.socketConnectors = socketConnectors; + public void setHttpClientMaxThreads(Integer httpClientMaxThreads) { + this.httpClientMaxThreads = httpClientMaxThreads; } public Integer getHttpClientMinThreads() { @@ -269,20 +260,28 @@ public class JettyHttpComponentConfiguration9 this.httpClientMinThreads = httpClientMinThreads; } - public Integer getHttpClientMaxThreads() { - return httpClientMaxThreads; + public String getHttpConfiguration() { + return httpConfiguration; } - public void setHttpClientMaxThreads(Integer httpClientMaxThreads) { - this.httpClientMaxThreads = httpClientMaxThreads; + public void setHttpConfiguration(String httpConfiguration) { + this.httpConfiguration = httpConfiguration; } - public Integer getMinThreads() { - return minThreads; + public String getJettyHttpBinding() { + return jettyHttpBinding; } - public void setMinThreads(Integer minThreads) { - this.minThreads = minThreads; + public void setJettyHttpBinding(String jettyHttpBinding) { + this.jettyHttpBinding = jettyHttpBinding; + } + + public String getKeystore() { + return keystore; + } + + public void setKeystore(String keystore) { + this.keystore = keystore; } public Integer getMaxThreads() { @@ -293,61 +292,76 @@ public class JettyHttpComponentConfiguration9 this.maxThreads = maxThreads; } - public String getThreadPool() { - return threadPool; + public String getMbContainer() { + return mbContainer; } - public void setThreadPool(String threadPool) { - this.threadPool = threadPool; + public void setMbContainer(String mbContainer) { + this.mbContainer = mbContainer; } - public Boolean getEnableJmx() { - return enableJmx; + public Integer getMinThreads() { + return minThreads; } - public void setEnableJmx(Boolean enableJmx) { - this.enableJmx = enableJmx; + public void setMinThreads(Integer minThreads) { + this.minThreads = minThreads; } - public String getJettyHttpBinding() { - return jettyHttpBinding; + public String getProxyHost() { + return proxyHost; } - public void setJettyHttpBinding(String jettyHttpBinding) { - this.jettyHttpBinding = jettyHttpBinding; + public void setProxyHost(String proxyHost) { + this.proxyHost = proxyHost; } - public String getHttpBinding() { - return httpBinding; + public Integer getProxyPort() { + return proxyPort; } - public void setHttpBinding(String httpBinding) { - this.httpBinding = httpBinding; + public void setProxyPort(Integer proxyPort) { + this.proxyPort = proxyPort; } - public String getHttpConfiguration() { - return httpConfiguration; + public Integer getRequestBufferSize() { + return requestBufferSize; } - public void setHttpConfiguration(String httpConfiguration) { - this.httpConfiguration = httpConfiguration; + public void setRequestBufferSize(Integer requestBufferSize) { + this.requestBufferSize = requestBufferSize; } - public String getMbContainer() { - return mbContainer; + public Integer getRequestHeaderSize() { + return requestHeaderSize; } - public void setMbContainer(String mbContainer) { - this.mbContainer = mbContainer; + public void setRequestHeaderSize(Integer requestHeaderSize) { + this.requestHeaderSize = requestHeaderSize; } - public Map<String, Object> getSslSocketConnectorProperties() { - return sslSocketConnectorProperties; + public Integer getResponseBufferSize() { + return responseBufferSize; } - public void setSslSocketConnectorProperties( - Map<String, Object> sslSocketConnectorProperties) { - this.sslSocketConnectorProperties = sslSocketConnectorProperties; + public void setResponseBufferSize(Integer responseBufferSize) { + this.responseBufferSize = responseBufferSize; + } + + public Integer getResponseHeaderSize() { + return responseHeaderSize; + } + + public void setResponseHeaderSize(Integer responseHeaderSize) { + this.responseHeaderSize = responseHeaderSize; + } + + public Boolean getSendServerVersion() { + return sendServerVersion; + } + + public void setSendServerVersion(Boolean sendServerVersion) { + this.sendServerVersion = sendServerVersion; } public Map<String, Object> getSocketConnectorProperties() { @@ -359,20 +373,12 @@ public class JettyHttpComponentConfiguration9 this.socketConnectorProperties = socketConnectorProperties; } - public Long getContinuationTimeout() { - return continuationTimeout; - } - - public void setContinuationTimeout(Long continuationTimeout) { - this.continuationTimeout = continuationTimeout; - } - - public Boolean getUseContinuation() { - return useContinuation; + public Map<Integer, Connector> getSocketConnectors() { + return socketConnectors; } - public void setUseContinuation(Boolean useContinuation) { - this.useContinuation = useContinuation; + public void setSocketConnectors(Map<Integer, Connector> socketConnectors) { + this.socketConnectors = socketConnectors; } public String getSslContextParameters() { @@ -383,61 +389,63 @@ public class JettyHttpComponentConfiguration9 this.sslContextParameters = sslContextParameters; } - public Boolean getUseGlobalSslContextParameters() { - return useGlobalSslContextParameters; + public String getSslKeyPassword() { + return sslKeyPassword; } - public void setUseGlobalSslContextParameters( - Boolean useGlobalSslContextParameters) { - this.useGlobalSslContextParameters = useGlobalSslContextParameters; + public void setSslKeyPassword(String sslKeyPassword) { + this.sslKeyPassword = sslKeyPassword; } - public Integer getResponseBufferSize() { - return responseBufferSize; + public String getSslPassword() { + return sslPassword; } - public void setResponseBufferSize(Integer responseBufferSize) { - this.responseBufferSize = responseBufferSize; + public void setSslPassword(String sslPassword) { + this.sslPassword = sslPassword; } - public Integer getRequestBufferSize() { - return requestBufferSize; + public Map<String, Object> getSslSocketConnectorProperties() { + return sslSocketConnectorProperties; } - public void setRequestBufferSize(Integer requestBufferSize) { - this.requestBufferSize = requestBufferSize; + public void setSslSocketConnectorProperties( + Map<String, Object> sslSocketConnectorProperties) { + this.sslSocketConnectorProperties = sslSocketConnectorProperties; } - public Integer getRequestHeaderSize() { - return requestHeaderSize; + public Map<Integer, Connector> getSslSocketConnectors() { + return sslSocketConnectors; } - public void setRequestHeaderSize(Integer requestHeaderSize) { - this.requestHeaderSize = requestHeaderSize; + public void setSslSocketConnectors( + Map<Integer, Connector> sslSocketConnectors) { + this.sslSocketConnectors = sslSocketConnectors; } - public Integer getResponseHeaderSize() { - return responseHeaderSize; + public String getThreadPool() { + return threadPool; } - public void setResponseHeaderSize(Integer responseHeaderSize) { - this.responseHeaderSize = responseHeaderSize; + public void setThreadPool(String threadPool) { + this.threadPool = threadPool; } - public String getProxyHost() { - return proxyHost; + public Boolean getUseContinuation() { + return useContinuation; } - public void setProxyHost(String proxyHost) { - this.proxyHost = proxyHost; + public void setUseContinuation(Boolean useContinuation) { + this.useContinuation = useContinuation; } - public Integer getProxyPort() { - return proxyPort; + public Boolean getUseGlobalSslContextParameters() { + return useGlobalSslContextParameters; } - public void setProxyPort(Integer proxyPort) { - this.proxyPort = proxyPort; + public void setUseGlobalSslContextParameters( + Boolean useGlobalSslContextParameters) { + this.useGlobalSslContextParameters = useGlobalSslContextParameters; } public Boolean getUseXForwardedForHeader() { @@ -448,14 +456,6 @@ public class JettyHttpComponentConfiguration9 this.useXForwardedForHeader = useXForwardedForHeader; } - public Boolean getSendServerVersion() { - return sendServerVersion; - } - - public void setSendServerVersion(Boolean sendServerVersion) { - this.sendServerVersion = sendServerVersion; - } - public Boolean getAllowJavaSerializedObject() { return allowJavaSerializedObject; }
