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 316bf54ad7be6eaedf267507b6aea382e1a3b1bd
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Jul 31 15:26:17 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http
- aligned the other components using camel-http4
---
components/camel-jetty/pom.xml | 2 +-
.../camel/component/jetty/Http4DeleteWithBodyTest.java | 4 ++--
.../component/jetty/rest/RestHttpsClientAuthRouteTest.java | 2 +-
.../jetty/rest/producer/Http4RestProducerGetTest.java | 2 +-
.../jetty/rest/producer/Http4RestProducerPutTest.java | 2 +-
components/camel-kubernetes/pom.xml | 2 +-
components/camel-netty4-http/pom.xml | 2 +-
components/camel-rest-swagger/pom.xml | 2 +-
components/camel-rest/src/main/docs/rest-component.adoc | 5 ++---
components/camel-restlet/pom.xml | 2 +-
.../camel/component/restlet/RestRestletRouterIdTest.java | 12 ++++++------
components/camel-ribbon/pom.xml | 2 +-
components/camel-sap-netweaver/pom.xml | 2 +-
components/camel-spark-rest/pom.xml | 2 +-
components/camel-spring-boot/pom.xml | 2 +-
components/camel-spring-cloud-consul/pom.xml | 2 +-
components/camel-spring-cloud-netflix/pom.xml | 2 +-
components/camel-spring-cloud-zookeeper/pom.xml | 2 +-
components/camel-spring-cloud/pom.xml | 2 +-
components/camel-undertow/pom.xml | 2 +-
components/camel-zookeeper/pom.xml | 2 +-
.../camel/model/cloud/ServiceCallDefinitionConstants.java | 2 +-
22 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 6ebe17a..2f1e044 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -126,7 +126,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<!-- for testing rest-dsl -->
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/Http4DeleteWithBodyTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/Http4DeleteWithBodyTest.java
index 3c105bd..bdf1497 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/Http4DeleteWithBodyTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/Http4DeleteWithBodyTest.java
@@ -26,14 +26,14 @@ public class Http4DeleteWithBodyTest extends BaseJettyTest {
@Test
public void testHttp4DeleteWithBodyFalseTest() throws Exception {
byte[] data = "World".getBytes();
- String out =
template.requestBodyAndHeader("http4://localhost:{{port}}/test", data,
Exchange.HTTP_METHOD, "DELETE", String.class);
+ String out =
template.requestBodyAndHeader("http://localhost:{{port}}/test";, data,
Exchange.HTTP_METHOD, "DELETE", String.class);
assertEquals("Bye ", out);
}
@Test
public void testHttp4DeleteWithBodyTrueTest() throws Exception {
byte[] data = "World".getBytes();
- String out =
template.requestBodyAndHeader("http4://localhost:{{port}}/test?deleteWithBody=true",
data, Exchange.HTTP_METHOD, "DELETE", String.class);
+ String out =
template.requestBodyAndHeader("http://localhost:{{port}}/test?deleteWithBody=true";,
data, Exchange.HTTP_METHOD, "DELETE", String.class);
assertEquals("Bye World", out);
}
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java
index 5d698ed..3f30f47 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java
@@ -49,7 +49,7 @@ public class RestHttpsClientAuthRouteTest extends
CamelTestSupport {
}
protected String getClientURI() {
- return
"http4://localhost:%d/TestResource/some-id?sslContextParameters=#clientSSLContextParameters";
+ return
"http://localhost:%d/TestResource/some-id?sslContextParameters=#clientSSLContextParameters";;
}
protected void decorateRestConfiguration(RestConfigurationDefinition
restConfig) {
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerGetTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerGetTest.java
index 34cc9b2..300c4f7 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerGetTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerGetTest.java
@@ -37,7 +37,7 @@ public class Http4RestProducerGetTest extends BaseJettyTest {
public void configure() throws Exception {
restConfiguration().component("jetty").host("localhost").port(getPort())
// use camel-http4 as rest client
- .producerComponent("http4");
+ .producerComponent("http");
from("direct:start")
.to("rest:get:users/{id}/basic");
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerPutTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerPutTest.java
index 3db9eac..8d3cbb1 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerPutTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerPutTest.java
@@ -37,7 +37,7 @@ public class Http4RestProducerPutTest extends BaseJettyTest {
@Override
public void configure() throws Exception {
// configure to use localhost with the given port
-
restConfiguration().producerComponent("http4").component("jetty").host("localhost").port(getPort());
+
restConfiguration().producerComponent("http").component("jetty").host("localhost").port(getPort());
from("direct:start")
.to("rest:put:users/{id}");
diff --git a/components/camel-kubernetes/pom.xml
b/components/camel-kubernetes/pom.xml
index a509229..7382c6b 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-netty4-http/pom.xml
b/components/camel-netty4-http/pom.xml
index 999fe1e..0576f25 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-rest-swagger/pom.xml
b/components/camel-rest-swagger/pom.xml
index 20e76d2..196b64c 100644
--- a/components/camel-rest-swagger/pom.xml
+++ b/components/camel-rest-swagger/pom.xml
@@ -124,7 +124,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-rest/src/main/docs/rest-component.adoc
b/components/camel-rest/src/main/docs/rest-component.adoc
index 7d0b24f..46d150b 100644
--- a/components/camel-rest/src/main/docs/rest-component.adoc
+++ b/components/camel-rest/src/main/docs/rest-component.adoc
@@ -134,7 +134,6 @@ The following components support rest consumer (Rest DSL):
The following components support rest producer:
* camel-http
-* camel-http4
* camel-netty4-http
* camel-jetty
* camel-restlet
@@ -219,11 +218,11 @@ from("direct:start")
----
You can use the `producerComponent` to select which Camel component to use as
the HTTP client, for example
-to use http4 you can do:
+to use http you can do:
[source,java]
----
-restConfiguration().host("myserver:8080/foo").producerComponent("http4");
+restConfiguration().host("myserver:8080/foo").producerComponent("http");
from("direct:start")
.to("rest:get:hello/{me}");
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index 84cf5cc..b3e90b9 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -102,7 +102,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java
index 315c79e..034d4e0 100644
---
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java
+++
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java
@@ -62,17 +62,17 @@ public class RestRestletRouterIdTest extends
CamelTestSupport {
@Test
public void test() throws Exception {
- Assert.assertEquals("\"test1\"",
template.requestBodyAndHeader("http4://localhost:" + port + "/app/test1", "",
Exchange.HTTP_METHOD, HttpMethods.GET, String.class));
+ Assert.assertEquals("\"test1\"",
template.requestBodyAndHeader("http://localhost:"; + port + "/app/test1", "",
Exchange.HTTP_METHOD, HttpMethods.GET, String.class));
- Assert.assertEquals("\"test2\"",
template.requestBodyAndHeader("http4://localhost:" + port + "/app/test2", "",
Exchange.HTTP_METHOD, HttpMethods.GET, String.class));
+ Assert.assertEquals("\"test2\"",
template.requestBodyAndHeader("http://localhost:"; + port + "/app/test2", "",
Exchange.HTTP_METHOD, HttpMethods.GET, String.class));
- Assert.assertEquals("\"test3\"",
template.requestBodyAndHeader("http4://localhost:" + port + "/app/test3", "",
Exchange.HTTP_METHOD, HttpMethods.GET, String.class));
+ Assert.assertEquals("\"test3\"",
template.requestBodyAndHeader("http://localhost:"; + port + "/app/test3", "",
Exchange.HTTP_METHOD, HttpMethods.GET, String.class));
- Assert.assertEquals("\"test4\"",
template.requestBodyAndHeader("http4://localhost:" + port + "/app/test4", "",
Exchange.HTTP_METHOD, HttpMethods.GET, String.class));
+ Assert.assertEquals("\"test4\"",
template.requestBodyAndHeader("http://localhost:"; + port + "/app/test4", "",
Exchange.HTTP_METHOD, HttpMethods.GET, String.class));
- Assert.assertEquals("\"test5\"",
template.requestBodyAndHeader("http4://localhost:" + port + "/app/test5", "",
Exchange.HTTP_METHOD, HttpMethods.GET, String.class));
+ Assert.assertEquals("\"test5\"",
template.requestBodyAndHeader("http://localhost:"; + port + "/app/test5", "",
Exchange.HTTP_METHOD, HttpMethods.GET, String.class));
Assert.assertEquals("\"REST-TEST\"",
- template.requestBodyAndHeader("http4://localhost:"
+ port + "/app/REST-TEST", "", Exchange.HTTP_METHOD, HttpMethods.GET,
String.class));
+ template.requestBodyAndHeader("http://localhost:";
+ port + "/app/REST-TEST", "", Exchange.HTTP_METHOD, HttpMethods.GET,
String.class));
}
}
diff --git a/components/camel-ribbon/pom.xml b/components/camel-ribbon/pom.xml
index ac68cc4..8a938ce 100644
--- a/components/camel-ribbon/pom.xml
+++ b/components/camel-ribbon/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-sap-netweaver/pom.xml
b/components/camel-sap-netweaver/pom.xml
index 890b47d..07dccd8 100644
--- a/components/camel-sap-netweaver/pom.xml
+++ b/components/camel-sap-netweaver/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
</dependency>
<!-- Jackson -->
<dependency>
diff --git a/components/camel-spark-rest/pom.xml
b/components/camel-spark-rest/pom.xml
index e61ff4c..3588a51 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-spring-boot/pom.xml
b/components/camel-spring-boot/pom.xml
index c318f53..f00cae7 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -143,7 +143,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-spring-cloud-consul/pom.xml
b/components/camel-spring-cloud-consul/pom.xml
index 37d5c49..efb05ca 100644
--- a/components/camel-spring-cloud-consul/pom.xml
+++ b/components/camel-spring-cloud-consul/pom.xml
@@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-spring-cloud-netflix/pom.xml
b/components/camel-spring-cloud-netflix/pom.xml
index 9dffa72..ed80b88 100644
--- a/components/camel-spring-cloud-netflix/pom.xml
+++ b/components/camel-spring-cloud-netflix/pom.xml
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-spring-cloud-zookeeper/pom.xml
b/components/camel-spring-cloud-zookeeper/pom.xml
index c3694df..af9f439 100644
--- a/components/camel-spring-cloud-zookeeper/pom.xml
+++ b/components/camel-spring-cloud-zookeeper/pom.xml
@@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-spring-cloud/pom.xml
b/components/camel-spring-cloud/pom.xml
index b461a17..247fcb4 100644
--- a/components/camel-spring-cloud/pom.xml
+++ b/components/camel-spring-cloud/pom.xml
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-undertow/pom.xml
b/components/camel-undertow/pom.xml
index c46c522..adf7c10 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-zookeeper/pom.xml
b/components/camel-zookeeper/pom.xml
index 6e817fb..739d752 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-http4</artifactId>
+ <artifactId>camel-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
index 5f3a175..719731c 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
@@ -18,7 +18,7 @@ package org.apache.camel.model.cloud;
public final class ServiceCallDefinitionConstants {
public static final String RESOURCE_PATH =
"META-INF/services/org/apache/camel/cloud/";
- public static final String DEFAULT_COMPONENT = "http4";
+ public static final String DEFAULT_COMPONENT = "http";
public static final String DEFAULT_SERVICE_CALL_CONFIG_ID =
"service-call-configuration";
public static final String DEFAULT_SERVICE_CALL_EXPRESSION_ID =
"service-call-expression";
public static final String DEFAULT_SERVICE_DISCOVERY_ID =
"service-discovery";
