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:27:50 UTC

[camel] 01/02: CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Rename Http4ServiceExpressionFactory @CloudServiceFactory

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 661a012be3fb07457c0aba28ce3334c47d8e622b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 1 12:20:27 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Rename Http4ServiceExpressionFactory @CloudServiceFactory
---
 components/camel-http/src/main/docs/http-component.adoc  |  2 +-
 .../http4/cloud/Http4ServiceExpressionFactory.java       |  2 +-
 .../builder/endpoint/dsl/HttpEndpointBuilderFactory.java | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc
index 99d308f..51299f8 100644
--- a/components/camel-http/src/main/docs/http-component.adoc
+++ b/components/camel-http/src/main/docs/http-component.adoc
@@ -108,7 +108,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
 | *authenticationPreemptive* (producer) | If this option is true, camel-http sends preemptive basic authentication to the server. | false | boolean
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpressionFactory.java b/components/camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpressionFactory.java
index 7912c82..124386a 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpressionFactory.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpressionFactory.java
@@ -21,7 +21,7 @@ import org.apache.camel.Expression;
 import org.apache.camel.cloud.ServiceExpressionFactory;
 import org.apache.camel.spi.annotations.CloudServiceFactory;
 
-@CloudServiceFactory("http4-service-expression,https4-service-expression")
+@CloudServiceFactory("http-service-expression,https-service-expression")
 public class Http4ServiceExpressionFactory implements ServiceExpressionFactory {
     @Override
     public Expression newInstance(CamelContext camelContext) throws Exception {
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
index ebbb32d..07a8541 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
@@ -52,10 +52,10 @@ public interface HttpEndpointBuilderFactory {
          * 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 HttpEndpointBuilderFactory {
          * 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.
          *