You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/08/02 14:46:30 UTC
[camel] 02/08: Regen
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 081e0f020342f41a2b187620c4a3275d2645ee42
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Aug 2 07:24:38 2019 +0200
Regen
---
.../main/docs/atmosphere-websocket-component.adoc | 2 +-
.../camel-jetty/src/main/docs/jetty-component.adoc | 2 +-
.../AtmosphereWebsocketEndpointBuilderFactory.java | 48 +++++++++++-----------
.../dsl/JettyHttpEndpointBuilder9Factory.java | 16 ++++----
.../ROOT/pages/atmosphere-websocket-component.adoc | 2 +-
.../modules/ROOT/pages/jetty-component.adoc | 2 +-
.../modules/ROOT/pages/mock-component.adoc | 3 +-
7 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
index 8d56b7b..0bc2824 100644
--- a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
+++ b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
@@ -85,7 +85,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *sendToAll* (common) | Whether to send to all (broadcast) or send to a single receiver. | false | boolean
| *useStreaming* (common) | To enable streaming to send data as multiple text fragments. | false | boolean
-| *disableStreamCache* (common) | 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 persis [...]
+| *disableStreamCache* (common) | 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 persis [...]
| *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| *httpBinding* (common) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | HttpBinding
| *async* (consumer) | Configure the consumer to work in async mode | 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 1095244..c3d1349 100644
--- a/components/camel-jetty/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty/src/main/docs/jetty-component.adoc
@@ -126,7 +126,7 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *disableStreamCache* (common) | 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 persis [...]
+| *disableStreamCache* (common) | 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 persis [...]
| *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| *httpBinding* (common) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | HttpBinding
| *async* (consumer) | Configure the consumer to work in async mode | false | boolean
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
index 68f3a06..617fd03 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
@@ -103,10 +103,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
* 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 producer will by default cache the response
- * body stream. If setting this option to true, then the producers will
- * not cache the response body stream but use the response stream as-is
- * as the message body.
+ * multiple times. The http/http4 producer will by default cache the
+ * response body stream. If setting this option to true, then the
+ * producers will not cache the response body stream but use the
+ * response stream as-is as the message body.
*
* The option is a: <code>boolean</code> type.
*
@@ -130,10 +130,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
* 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 producer will by default cache the response
- * body stream. If setting this option to true, then the producers will
- * not cache the response body stream but use the response stream as-is
- * as the message body.
+ * multiple times. The http/http4 producer will by default cache the
+ * response body stream. If setting this option to true, then the
+ * producers will not cache the response body stream but use the
+ * response stream as-is as the message body.
*
* The option will be converted to a <code>boolean</code> type.
*
@@ -806,10 +806,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
* 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 producer will by default cache the response
- * body stream. If setting this option to true, then the producers will
- * not cache the response body stream but use the response stream as-is
- * as the message body.
+ * multiple times. The http/http4 producer will by default cache the
+ * response body stream. If setting this option to true, then the
+ * producers will not cache the response body stream but use the
+ * response stream as-is as the message body.
*
* The option is a: <code>boolean</code> type.
*
@@ -833,10 +833,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
* 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 producer will by default cache the response
- * body stream. If setting this option to true, then the producers will
- * not cache the response body stream but use the response stream as-is
- * as the message body.
+ * multiple times. The http/http4 producer will by default cache the
+ * response body stream. If setting this option to true, then the
+ * producers will not cache the response body stream but use the
+ * response stream as-is as the message body.
*
* The option will be converted to a <code>boolean</code> type.
*
@@ -1187,10 +1187,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
* 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 producer will by default cache the response
- * body stream. If setting this option to true, then the producers will
- * not cache the response body stream but use the response stream as-is
- * as the message body.
+ * multiple times. The http/http4 producer will by default cache the
+ * response body stream. If setting this option to true, then the
+ * producers will not cache the response body stream but use the
+ * response stream as-is as the message body.
*
* The option is a: <code>boolean</code> type.
*
@@ -1214,10 +1214,10 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
* 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 producer will by default cache the response
- * body stream. If setting this option to true, then the producers will
- * not cache the response body stream but use the response stream as-is
- * as the message body.
+ * multiple times. The http/http4 producer will by default cache the
+ * response body stream. If setting this option to true, then the
+ * producers will not cache the response body stream but use the
+ * response stream as-is as the message body.
*
* The option will be converted to a <code>boolean</code> type.
*
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
index 6195b7f..711247d 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
@@ -54,10 +54,10 @@ public interface JettyHttpEndpointBuilder9Factory {
* 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 producer will by default cache the response
- * body stream. If setting this option to true, then the producers will
- * not cache the response body stream but use the response stream as-is
- * as the message body.
+ * multiple times. The http/http4 producer will by default cache the
+ * response body stream. If setting this option to true, then the
+ * producers will not cache the response body stream but use the
+ * response stream as-is as the message body.
*
* The option is a: <code>boolean</code> type.
*
@@ -81,10 +81,10 @@ public interface JettyHttpEndpointBuilder9Factory {
* 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 producer will by default cache the response
- * body stream. If setting this option to true, then the producers will
- * not cache the response body stream but use the response stream as-is
- * as the message body.
+ * multiple times. The http/http4 producer will by default cache the
+ * response body stream. If setting this option to true, then the
+ * producers will not cache the response body stream but use the
+ * response stream as-is as the message body.
*
* The option will be converted to a <code>boolean</code> type.
*
diff --git a/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc b/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
index 8d56b7b..0bc2824 100644
--- a/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
+++ b/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
@@ -85,7 +85,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *sendToAll* (common) | Whether to send to all (broadcast) or send to a single receiver. | false | boolean
| *useStreaming* (common) | To enable streaming to send data as multiple text fragments. | false | boolean
-| *disableStreamCache* (common) | 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 persis [...]
+| *disableStreamCache* (common) | 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 persis [...]
| *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| *httpBinding* (common) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | HttpBinding
| *async* (consumer) | Configure the consumer to work in async mode | false | boolean
diff --git a/docs/components/modules/ROOT/pages/jetty-component.adoc b/docs/components/modules/ROOT/pages/jetty-component.adoc
index 1095244..c3d1349 100644
--- a/docs/components/modules/ROOT/pages/jetty-component.adoc
+++ b/docs/components/modules/ROOT/pages/jetty-component.adoc
@@ -126,7 +126,7 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *disableStreamCache* (common) | 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 persis [...]
+| *disableStreamCache* (common) | 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 persis [...]
| *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| *httpBinding* (common) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | HttpBinding
| *async* (consumer) | Configure the consumer to work in async mode | false | boolean
diff --git a/docs/components/modules/ROOT/pages/mock-component.adoc b/docs/components/modules/ROOT/pages/mock-component.adoc
index 9a11ced..409a9e2 100644
--- a/docs/components/modules/ROOT/pages/mock-component.adoc
+++ b/docs/components/modules/ROOT/pages/mock-component.adoc
@@ -112,7 +112,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (12 parameters):
+=== Query Parameters (13 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -120,6 +120,7 @@ with the following path and query parameters:
| Name | Description | Default | Type
| *assertPeriod* (producer) | Sets a grace period after which the mock endpoint will re-assert to ensure the preliminary assertion is still valid. This is used for example to assert that exactly a number of messages arrives. For example if expectedMessageCount(int) was set to 5, then the assertion is satisfied when 5 or more message arrives. To ensure that exactly 5 messages arrives, then you would need to wait a little period to ensure no further message arrives. This is what you can us [...]
| *expectedCount* (producer) | Specifies the expected number of message exchanges that should be received by this endpoint. Beware: If you want to expect that 0 messages, then take extra care, as 0 matches when the tests starts, so you need to set a assert period time to let the test run for a while to make sure there are still no messages arrived; for that use setAssertPeriod(long). An alternative is to use NotifyBuilder, and use the notifier to know when Camel is done routing some mess [...]
+| *failFast* (producer) | Sets whether assertIsSatisfied() should fail fast at the first detected failed expectation while it may otherwise wait for all expected messages to arrive before performing expectations verifications. Is by default true. Set to false to use behavior as in Camel 2.x. | false | boolean
| *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 [...]
| *reportGroup* (producer) | A number that is used to turn on throughput logging based on groups of the size. | | int
| *resultMinimumWaitTime* (producer) | Sets the minimum expected amount of time (in millis) the assertIsSatisfied() will wait on a latch until it is satisfied | 0 | long