You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/01 10:59:39 UTC
[camel] branch master updated (0bca779 -> 965cda7)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 0bca779 CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Removed reference to http4 in camel-opentracing and regen
new 8e4a7bd CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Removed reference to http4 in camel-rest-swagger
new 965cda7 CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Removed reference to http4 in camel-servlet
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/component/rest/swagger/HttpsTest.java | 6 ------
.../camel-servlet/src/main/docs/servlet-component.adoc | 2 +-
.../apache/camel/component/servlet/ServletEndpoint.java | 2 +-
.../endpoint/dsl/ServletEndpointBuilderFactory.java | 16 ++++++++--------
4 files changed, 10 insertions(+), 16 deletions(-)
[camel] 02/02: CAMEL-13792 - Rename components to default names,
Camel-http4 to Camel-http - Removed reference to http4 in
camel-servlet
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 965cda7c9743a353d3a970743149397adcfeb632
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 1 12:59:20 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Removed reference to http4 in camel-servlet
---
.../camel-servlet/src/main/docs/servlet-component.adoc | 2 +-
.../apache/camel/component/servlet/ServletEndpoint.java | 2 +-
.../endpoint/dsl/ServletEndpointBuilderFactory.java | 16 ++++++++--------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/components/camel-servlet/src/main/docs/servlet-component.adoc b/components/camel-servlet/src/main/docs/servlet-component.adoc
index 53d8498..7f485ac 100644
--- a/components/camel-servlet/src/main/docs/servlet-component.adoc
+++ b/components/camel-servlet/src/main/docs/servlet-component.adoc
@@ -92,7 +92,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/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java
index 6c67a74..482f5f4 100644
--- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java
+++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java
@@ -145,7 +145,7 @@ public class ServletEndpoint extends HttpCommonEndpoint {
@Override
public Producer createProducer() throws Exception {
- throw new UnsupportedOperationException("You cannot create producer with servlet endpoint, please consider to use http or http4 endpoint.");
+ throw new UnsupportedOperationException("You cannot create producer with servlet endpoint, please consider to use http endpoint.");
}
@Override
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
index f0fab7a..1538773 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
@@ -52,10 +52,10 @@ public interface ServletEndpointBuilderFactory {
* reading the stream multiple times. If you use Servlet to bridge/proxy
* an endpoint then consider enabling this option to improve
* performance, in case you do not need to read the message payload
- * multiple times. The http/http4 producer will by default cache the
- * response body stream. If setting this option to true, then the
- * producers will not cache the response body stream but use the
- * response stream as-is as the message body.
+ * 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.
*
* The option is a: <code>boolean</code> type.
*
@@ -79,10 +79,10 @@ public interface ServletEndpointBuilderFactory {
* reading the stream multiple times. If you use Servlet to bridge/proxy
* an endpoint then consider enabling this option to improve
* performance, in case you do not need to read the message payload
- * multiple times. The http/http4 producer will by default cache the
- * response body stream. If setting this option to true, then the
- * producers will not cache the response body stream but use the
- * response stream as-is as the message body.
+ * 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.
*
* The option will be converted to a <code>boolean</code> type.
*
[camel] 01/02: CAMEL-13792 - Rename components to default names,
Camel-http4 to Camel-http - Removed reference to http4 in
camel-rest-swagger
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8e4a7bddd68b63f388fefda43be731abffc1449c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 1 12:57:56 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Removed reference to http4 in camel-rest-swagger
---
.../java/org/apache/camel/component/rest/swagger/HttpsTest.java | 6 ------
1 file changed, 6 deletions(-)
diff --git a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
index 9e5a98c..bdf8321 100644
--- a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
+++ b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
@@ -133,12 +133,6 @@ public abstract class HttpsTest extends CamelTestSupport {
// the commons-httpclient (all endpoints, component instances)
producers.remove("http");
- // `http4` component transforms the endpoint uri from `http4://` to
- // `https4://` we need to accommodate for that otherwise we'll end up
- // configuring the wrong component's properties in
- // RestSwaggerDelegateHttpsTest
- producers.replaceAll(c -> "http4".equals(c) ? "https4" : c);
-
return producers;
}