[camel] branch master updated: CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Camel-cloud reference to htt4 removed

[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


The following commit(s) were added to refs/heads/master by this push:
     new a79ea5b  CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Camel-cloud reference to htt4 removed
a79ea5b is described below

commit a79ea5be4f9756924c4c9f6fd206b0e55d2130a1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 1 12:05:34 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Camel-cloud reference to htt4 removed
---
 .../camel/impl/cloud/DefaultServiceCallExpression.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java
index 58ccb3e..06d1552 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java
@@ -24,10 +24,10 @@ import org.slf4j.LoggerFactory;
  * <p/>
  * Below are some examples how to call a service and what Camel endpoint URI is constructed based on the input:
  * <pre>
- serviceCall("myService") -> http4://hostname:port
- serviceCall("myService/foo") -> http4://hostname:port/foo
- serviceCall("http4:myService/foo") -> http4:hostname:port/foo
- serviceCall("myService", "http4:myService.host:myService.port/foo") -> http4:hostname:port/foo
+ serviceCall("myService") -> http://hostname:port
+ serviceCall("myService/foo") -> http://hostname:port/foo
+ serviceCall("http:myService/foo") -> http:hostname:port/foo
+ serviceCall("myService", "http:myService.host:myService.port/foo") -> http:hostname:port/foo
  serviceCall("myService", "netty4:tcp:myService?connectTimeout=1000") -> netty:tcp:hostname:port?connectTimeout=1000
  * </pre>
  */
@@ -75,11 +75,11 @@ public class DefaultServiceCallExpression extends ServiceCallExpressionSupport {
         if (scheme == null) {
             // use http/https by default if no scheme or port have been configured
             if (port == null) {
-                scheme = "http4";
+                scheme = "http";
             } else if (port == 443) {
-                scheme = "https4";
+                scheme = "https";
             } else {
-                scheme = "http4";
+                scheme = "http";
             }
         }