This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 60a9291bfc7 CAMEL-21323 upgrade camel-http to 5.3 (#15697)
60a9291bfc7 is described below
commit 60a9291bfc7a35a3707249c72c113cff2a48cb18
Author: Jono Morris <[email protected]>
AuthorDate: Thu Sep 26 00:11:52 2024 +1200
CAMEL-21323 upgrade camel-http to 5.3 (#15697)
---
.../http/CamelComponentVerifierExtensionTest.java | 7 ++++---
.../camel/component/http/CamelComponentVerifierTest.java | 7 ++++---
.../apache/camel/component/http/FollowRedirectTest.java | 3 ++-
.../camel/component/http/HttpAuthenticationTest.java | 5 ++++-
.../java/org/apache/camel/component/http/HttpBodyTest.java | 3 ++-
.../camel/component/http/HttpBridgeEndpointTest.java | 3 ++-
.../apache/camel/component/http/HttpCamelHeadersTest.java | 7 ++++---
.../org/apache/camel/component/http/HttpCharsetTest.java | 9 +++++----
.../apache/camel/component/http/HttpCompressionTest.java | 5 ++++-
.../apache/camel/component/http/HttpConcurrentTest.java | 3 ++-
.../camel/component/http/HttpDefaultPortNumberTest.java | 3 ++-
.../camel/component/http/HttpDisableStreamCacheTest.java | 3 ++-
.../org/apache/camel/component/http/HttpMethodsTest.java | 3 ++-
.../apache/camel/component/http/HttpNoCamelHeaderTest.java | 3 ++-
.../component/http/HttpNoConnectionRedeliveryTest.java | 3 ++-
.../apache/camel/component/http/HttpNoConnectionTest.java | 3 ++-
.../camel/component/http/HttpOAuth2AuthenticationTest.java | 3 ++-
.../java/org/apache/camel/component/http/HttpPathTest.java | 3 ++-
.../camel/component/http/HttpPollingConsumerTest.java | 3 ++-
.../component/http/HttpProducerBridgeEndpointTest.java | 3 ++-
.../component/http/HttpProducerConnectionCloseTest.java | 3 ++-
.../component/http/HttpProducerContentLengthTest.java | 3 ++-
.../camel/component/http/HttpProducerContentTypeTest.java | 3 ++-
.../http/HttpProducerContentTypeWithCharsetTest.java | 3 ++-
.../http/HttpProducerContentTypeWithSemiColonTest.java | 3 ++-
.../camel/component/http/HttpProducerCustomHeaderTest.java | 3 ++-
.../http/HttpProducerExplicitConnectionCloseTest.java | 3 ++-
.../camel/component/http/HttpProducerLoadManualIT.java | 3 ++-
.../camel/component/http/HttpProducerNullBodyTest.java | 3 ++-
.../camel/component/http/HttpProducerRestartTest.java | 3 ++-
.../camel/component/http/HttpProducerSelectMethodTest.java | 3 ++-
.../http/HttpProducerTwoHeadersWithSameKeyTest.java | 3 ++-
.../http/HttpProducerTwoParametersWithSameKeyTest.java | 3 ++-
.../camel/component/http/HttpProducerUserAgentTest.java | 3 ++-
.../camel/component/http/HttpProxyAndBasicAuthTest.java | 3 ++-
.../apache/camel/component/http/HttpProxyServerTest.java | 5 ++++-
.../camel/component/http/HttpQueryParameterTest.java | 3 ++-
.../org/apache/camel/component/http/HttpQueryTest.java | 3 ++-
.../org/apache/camel/component/http/HttpRedirectTest.java | 3 ++-
.../org/apache/camel/component/http/HttpSOTimeoutTest.java | 3 ++-
.../component/http/HttpSendDynamicAwareBasicAuthTest.java | 3 ++-
.../component/http/HttpSendDynamicAwareEmptyPathTest.java | 3 ++-
.../component/http/HttpSendDynamicAwareHeadersTest.java | 3 ++-
.../component/http/HttpSendDynamicAwareMultiValueTest.java | 1 +
.../component/http/HttpSendDynamicAwarePathHeaderTest.java | 3 ++-
.../http/HttpSendDynamicAwareRawParameterTest.java | 1 +
.../camel/component/http/HttpSendDynamicAwareRawTest.java | 3 ++-
.../camel/component/http/HttpSendDynamicAwareTest.java | 3 ++-
.../http/HttpSendDynamicAwareUriWithSpacesTest.java | 3 ++-
.../http/HttpSendDynamicAwareUriWithoutSlashTest.java | 3 ++-
.../apache/camel/component/http/HttpSetHeaderIdsTest.java | 3 ++-
.../apache/camel/component/http/HttpSquareBracketTest.java | 3 ++-
.../component/http/HttpStreamCacheNoSpoolToDiskTest.java | 3 ++-
.../component/http/HttpStreamCacheSpoolToDiskTest.java | 3 ++-
.../component/http/HttpThrowExceptionOnFailureTest.java | 3 ++-
.../apache/camel/component/http/HttpToDSOTimeoutTest.java | 3 ++-
.../camel/component/http/HttpWithHttpUriHeaderTest.java | 3 ++-
.../camel/component/http/HttpsAuthenticationTest.java | 5 ++++-
.../java/org/apache/camel/component/http/HttpsGetTest.java | 3 ++-
.../http/HttpsProducerWithSystemPropertiesTest.java | 3 ++-
.../component/http/HttpsSslContextParametersGetTest.java | 3 ++-
.../HttpsTwoComponentsSslContextParametersGetTest.java | 14 +++++++++++++-
.../http/HttpsTwoDifferentSslContextParametersGetTest.java | 3 ++-
.../component/http/ManagedHttpProducerPoolStatsTest.java | 3 ++-
.../http/rest/RestCamelComponentVerifierTest.java | 6 ++++--
parent/pom.xml | 2 +-
66 files changed, 159 insertions(+), 74 deletions(-)
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierExtensionTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierExtensionTest.java
index 10c7ce113a6..b85f14784c6 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierExtensionTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierExtensionTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.http;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -33,6 +32,7 @@ import
org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.RequestValidateHost;
import org.apache.hc.core5.http.protocol.ResponseContent;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -51,7 +51,7 @@ public class CamelComponentVerifierExtensionTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
localServer = ServerBootstrap.bootstrap()
- .setHttpProcessor(getHttpProcessor())
+
.setCanonicalHostName("localhost").setHttpProcessor(getHttpProcessor())
.register("/basic", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent()))
.register("/auth",
new AuthenticationValidationHandler(
@@ -83,7 +83,8 @@ public class CamelComponentVerifierExtensionTest extends
BaseHttpTest {
private HttpProcessor getHttpProcessor() {
return new DefaultHttpProcessor(
- Collections.singletonList(
+ Arrays.asList(
+ new RequestValidateHost(),
new RequestBasicAuth()),
Arrays.asList(
new ResponseContent(),
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
index 7c241e5df1e..a8fd99af222 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.http;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -32,6 +31,7 @@ import
org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.io.HttpRequestHandler;
import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.RequestValidateHost;
import org.apache.hc.core5.http.protocol.ResponseContent;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -50,7 +50,7 @@ public class CamelComponentVerifierTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
localServer = ServerBootstrap.bootstrap()
- .setHttpProcessor(getHttpProcessor())
+
.setHttpProcessor(getHttpProcessor()).setCanonicalHostName("localhost")
.register("/basic", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent()))
.register("/auth",
new AuthenticationValidationHandler(
@@ -83,7 +83,8 @@ public class CamelComponentVerifierTest extends BaseHttpTest {
private HttpProcessor getHttpProcessor() {
return new DefaultHttpProcessor(
- Collections.singletonList(
+ Arrays.asList(
+ new RequestValidateHost(),
new RequestBasicAuth()),
Arrays.asList(
new ResponseContent(),
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/FollowRedirectTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/FollowRedirectTest.java
index 46ddc878cfc..8f026f6ac05 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/FollowRedirectTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/FollowRedirectTest.java
@@ -31,7 +31,8 @@ public class FollowRedirectTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/someplaceelse", new
BasicValidationHandler(GET.name(), null, null, "Bye World"))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpAuthenticationTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpAuthenticationTest.java
index ebd5c46e7aa..ddb8335c6df 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpAuthenticationTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpAuthenticationTest.java
@@ -32,6 +32,7 @@ import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.RequestValidateHost;
import org.apache.hc.core5.http.protocol.ResponseContent;
import org.junit.jupiter.api.Test;
@@ -50,7 +51,8 @@ public class HttpAuthenticationTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/search",
@@ -114,6 +116,7 @@ public class HttpAuthenticationTest extends BaseHttpTest {
@Override
protected HttpProcessor getBasicHttpProcessor() {
List<HttpRequestInterceptor> requestInterceptors = new ArrayList<>();
+ requestInterceptors.add(new RequestValidateHost());
requestInterceptors.add(new RequestBasicAuth());
List<HttpResponseInterceptor> responseInterceptors = new ArrayList<>();
responseInterceptors.add(new ResponseContent());
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyTest.java
index e274d5fe14c..6b9ee72439a 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyTest.java
@@ -44,7 +44,8 @@ public class HttpBodyTest extends BaseHttpTest {
Map<String, String> expectedHeaders = new HashMap<>();
expectedHeaders.put(CONTENT_TYPE, IMAGE_JPEG.getMimeType());
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/post", new BasicValidationHandler(POST.name(),
null, getBody(), getExpectedContent()))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
index 78bde17193b..b52c336914c 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
@@ -36,7 +36,8 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/", new BasicValidationHandler(GET.name(), null,
null, getExpectedContent()))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersTest.java
index ab87a4662fc..c9bd06ff02a 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersTest.java
@@ -46,11 +46,12 @@ public class HttpCamelHeadersTest extends BaseHttpTest {
expectedHeaders.put(ACCEPT_LANGUAGE, "pl");
localServer
- =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/",
- new MyHeaderValidationHandler(GET.name(),
"HTTP/1.0", getExpectedContent(), expectedHeaders))
+ new MyHeaderValidationHandler(GET.name(),
"HTTP/1.1", getExpectedContent(), expectedHeaders))
.create();
localServer.start();
}
@@ -85,7 +86,7 @@ public class HttpCamelHeadersTest extends BaseHttpTest {
exchange -> {
exchange.getIn().setHeader("TestHeader", "test");
exchange.getIn().setHeader(ACCEPT_LANGUAGE, "pl");
- exchange.getIn().setHeader(Exchange.HTTP_PROTOCOL_VERSION,
"HTTP/1.0");
+ exchange.getIn().setHeader(Exchange.HTTP_PROTOCOL_VERSION,
"HTTP/1.1");
});
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCharsetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCharsetTest.java
index 85304f14a62..6aa6955767d 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCharsetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCharsetTest.java
@@ -35,7 +35,8 @@ public class HttpCharsetTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/", new BasicValidationHandler(POST.name(), null,
getBody(), getExpectedContent())).create();
@@ -54,7 +55,7 @@ public class HttpCharsetTest extends BaseHttpTest {
public void sendCharsetInExchangeProperty() {
Exchange exchange = template.request(
"http://localhost:"; + localServer.getLocalPort() + "/",
exchange1 -> {
- exchange1.setProperty(Exchange.CHARSET_NAME, charset);
+ exchange1.getIn().setHeader(Exchange.CONTENT_TYPE,
"text/plain;charset=iso8859-1");
exchange1.getIn().setBody(getBody());
});
@@ -65,7 +66,7 @@ public class HttpCharsetTest extends BaseHttpTest {
public void sendByteArrayCharsetInExchangeProperty() {
Exchange exchange = template.request(
"http://localhost:"; + localServer.getLocalPort() + "/",
exchange1 -> {
- exchange1.setProperty(Exchange.CHARSET_NAME, charset);
+ exchange1.getIn().setHeader(Exchange.CONTENT_TYPE,
"text/plain;charset=iso8859-1");
exchange1.getIn().setBody(getBody().getBytes(charset));
});
@@ -76,7 +77,7 @@ public class HttpCharsetTest extends BaseHttpTest {
public void sendInputStreamCharsetInExchangeProperty() {
Exchange exchange = template.request(
"http://localhost:"; + localServer.getLocalPort() + "/",
exchange1 -> {
- exchange1.setProperty(Exchange.CHARSET_NAME, charset);
+ exchange1.getIn().setHeader(Exchange.CONTENT_TYPE,
"text/plain;charset=iso8859-1");
exchange1.getIn().setBody(new
ByteArrayInputStream(getBody().getBytes(charset)));
});
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCompressionTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCompressionTest.java
index e6c37a196d5..85906a00a97 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCompressionTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCompressionTest.java
@@ -47,6 +47,7 @@ import org.apache.hc.core5.http.io.entity.HttpEntityWrapper;
import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.RequestValidateHost;
import org.junit.jupiter.api.Test;
import static org.apache.camel.http.common.HttpMethods.POST;
@@ -66,7 +67,8 @@ public class HttpCompressionTest extends BaseHttpTest {
expectedHeaders.put(CONTENT_TYPE, TEXT_PLAIN.getMimeType());
expectedHeaders.put(CONTENT_ENCODING, "gzip");
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/",
@@ -106,6 +108,7 @@ public class HttpCompressionTest extends BaseHttpTest {
@Override
protected HttpProcessor getBasicHttpProcessor() {
List<HttpRequestInterceptor> requestInterceptors = new ArrayList<>();
+ requestInterceptors.add(new RequestValidateHost());
requestInterceptors.add(new RequestDecompressingInterceptor());
List<HttpResponseInterceptor> responseInterceptors = new ArrayList<>();
responseInterceptors.add(new ResponseCompressingInterceptor());
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpConcurrentTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpConcurrentTest.java
index a2411aced71..8ae55802018 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpConcurrentTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpConcurrentTest.java
@@ -41,7 +41,8 @@ public class HttpConcurrentTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/", (request, response, context) -> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java
index 431fdaea08d..a0f9cee846f 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java
@@ -39,7 +39,8 @@ public class HttpDefaultPortNumberTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/search", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java
index daa89f482d3..ed5635a7f77 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java
@@ -37,7 +37,8 @@ public class HttpDisableStreamCacheTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/test/", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
index ff2fa18fb23..802046102f1 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
@@ -47,7 +47,8 @@ public class HttpMethodsTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/get", new BasicValidationHandler(GET.name(), null,
null, getExpectedContent()))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoCamelHeaderTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoCamelHeaderTest.java
index 3bebe5fecd6..4e71200856b 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoCamelHeaderTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoCamelHeaderTest.java
@@ -35,7 +35,8 @@ public class HttpNoCamelHeaderTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/hello", (request, response, context) -> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java
index c0ffffc3219..a336a78affa 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java
@@ -38,7 +38,8 @@ public class HttpNoConnectionRedeliveryTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/search", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
index 2712f5a81bd..f49614a16ae 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
@@ -40,7 +40,8 @@ public class HttpNoConnectionTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/search", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpOAuth2AuthenticationTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpOAuth2AuthenticationTest.java
index 06e4c33d439..b8607b6c212 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpOAuth2AuthenticationTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpOAuth2AuthenticationTest.java
@@ -42,7 +42,8 @@ public class HttpOAuth2AuthenticationTest extends
BaseHttpTest {
Map<String, String> expectedHeaders = new HashMap<>();
expectedHeaders.put("Authorization", "Bearer " + FAKE_TOKEN);
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/token", new OAuth2TokenRequestHandler(FAKE_TOKEN,
clientId, clientSecret))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPathTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPathTest.java
index 2ffc8ee25e4..a1c3415e6e8 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPathTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPathTest.java
@@ -32,7 +32,8 @@ public class HttpPathTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/search", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent()))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java
index a697576838e..e2092d6f6fe 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java
@@ -38,7 +38,8 @@ public class HttpPollingConsumerTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/", new DelayValidationHandler(GET.name(), null,
null, getExpectedContent(), 1000)).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerBridgeEndpointTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerBridgeEndpointTest.java
index 6f013de6e41..13d4b4d30e3 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerBridgeEndpointTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerBridgeEndpointTest.java
@@ -49,7 +49,8 @@ public class HttpProducerBridgeEndpointTest extends
BaseHttpTest {
noBridgeExpectedHeaders.put("qp4", LONG.toString());
noBridgeExpectedHeaders.put("qp5", BOOLEAN.toString());
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/bridged",
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerConnectionCloseTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerConnectionCloseTest.java
index 22722dc1eb9..52ffd628b02 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerConnectionCloseTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerConnectionCloseTest.java
@@ -42,7 +42,8 @@ public class HttpProducerConnectionCloseTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/myget", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentLengthTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentLengthTest.java
index 3380420aa3c..0d58650b6d9 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentLengthTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentLengthTest.java
@@ -40,7 +40,8 @@ public class HttpProducerContentLengthTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/content-streamed", (request, response, context) ->
{
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeTest.java
index 0597ddbe555..948ffc3c16c 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeTest.java
@@ -40,7 +40,8 @@ public class HttpProducerContentTypeTest extends BaseHttpTest
{
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/content", (request, response, context) -> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithCharsetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithCharsetTest.java
index 62e12eb05ce..2b738825954 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithCharsetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithCharsetTest.java
@@ -41,7 +41,8 @@ public class HttpProducerContentTypeWithCharsetTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/content", (request, response, context) -> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithSemiColonTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithSemiColonTest.java
index d9aa91e84b7..c669b7e24fb 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithSemiColonTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithSemiColonTest.java
@@ -40,7 +40,8 @@ public class HttpProducerContentTypeWithSemiColonTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/content", (request, response, context) -> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerCustomHeaderTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerCustomHeaderTest.java
index 3844c63a1c3..aefca312a1d 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerCustomHeaderTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerCustomHeaderTest.java
@@ -37,7 +37,8 @@ public class HttpProducerCustomHeaderTest extends
BaseHttpTest {
Map<String, String> expectedHeaders = new HashMap<>();
expectedHeaders.put(HttpHeaders.HOST, CUSTOM_HOST);
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.registerVirtual(CUSTOM_HOST, "*",
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
index 7298c42a2a0..a664ec864ad 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
@@ -35,7 +35,8 @@ public class HttpProducerExplicitConnectionCloseTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/myget", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerLoadManualIT.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerLoadManualIT.java
index 7d058e42b90..f37d54339ae 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerLoadManualIT.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerLoadManualIT.java
@@ -44,7 +44,8 @@ public class HttpProducerLoadManualIT extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/echo", new DrinkValidationHandler(GET.name(),
null, null, "myHeader")).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerNullBodyTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerNullBodyTest.java
index c7545f8ae16..98716fb6935 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerNullBodyTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerNullBodyTest.java
@@ -34,7 +34,8 @@ public class HttpProducerNullBodyTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/null-body", (request, response, context) -> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerRestartTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerRestartTest.java
index 142e8316b84..9ec68bff782 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerRestartTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerRestartTest.java
@@ -36,7 +36,8 @@ public class HttpProducerRestartTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/hello", (request, response, context) -> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
index fa17e2a6a0f..911ffde2ba5 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
@@ -39,7 +39,8 @@ public class HttpProducerSelectMethodTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/myget", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent()))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoHeadersWithSameKeyTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoHeadersWithSameKeyTest.java
index b8a80dff886..7f47d0d13b6 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoHeadersWithSameKeyTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoHeadersWithSameKeyTest.java
@@ -41,7 +41,8 @@ public class HttpProducerTwoHeadersWithSameKeyTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/myapp", (request, response, context) -> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoParametersWithSameKeyTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoParametersWithSameKeyTest.java
index 5ea4d94c44b..49c25fc3bdf 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoParametersWithSameKeyTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoParametersWithSameKeyTest.java
@@ -39,7 +39,8 @@ public class HttpProducerTwoParametersWithSameKeyTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/myapp", (request, response, context) -> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerUserAgentTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerUserAgentTest.java
index e665f50043d..6e2c40e1aaa 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerUserAgentTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerUserAgentTest.java
@@ -38,7 +38,8 @@ public class HttpProducerUserAgentTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/agent", (request, response, context) -> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyAndBasicAuthTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyAndBasicAuthTest.java
index 7289443d6de..ff763b59898 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyAndBasicAuthTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyAndBasicAuthTest.java
@@ -47,7 +47,8 @@ public class HttpProxyAndBasicAuthTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- proxy =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ proxy = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.registerVirtual("authtest.org", "*", new
ProxyAndBasicAuthenticationValidationHandler(
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyServerTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyServerTest.java
index baa2ce1f523..4e04e2b0fdf 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyServerTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyServerTest.java
@@ -32,6 +32,7 @@ import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.RequestValidateHost;
import org.apache.hc.core5.http.protocol.ResponseContent;
import org.junit.jupiter.api.Test;
@@ -48,7 +49,8 @@ public class HttpProxyServerTest extends BaseHttpTest {
// Don't test anymore the Proxy-Connection header as it is highly
discouraged, so its support has been removed
// https://issues.apache.org/jira/browse/HTTPCLIENT-1957
// expectedHeaders.put("Proxy-Connection", "Keep-Alive");
- proxy =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ proxy = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("127.0.0.1").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("*",
@@ -68,6 +70,7 @@ public class HttpProxyServerTest extends BaseHttpTest {
@Override
protected HttpProcessor getBasicHttpProcessor() {
List<HttpRequestInterceptor> requestInterceptors = new ArrayList<>();
+ requestInterceptors.add(new RequestValidateHost());
requestInterceptors.add(new RequestProxyBasicAuth());
List<HttpResponseInterceptor> responseInterceptors = new ArrayList<>();
responseInterceptors.add(new ResponseContent());
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryParameterTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryParameterTest.java
index fa204b1c50e..82dd502a9b2 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryParameterTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryParameterTest.java
@@ -32,7 +32,8 @@ public class HttpQueryParameterTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/moes", new DrinkQueryValidationHandler(GET.name(),
null, null, "drink"))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryTest.java
index 502238dce17..c4804311ba1 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryTest.java
@@ -32,7 +32,8 @@ public class HttpQueryTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/", new BasicValidationHandler(GET.name(),
"hl=en&q=camel", null, getExpectedContent()))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRedirectTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRedirectTest.java
index 0a44c1afe71..4b95bad11a9 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRedirectTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRedirectTest.java
@@ -43,7 +43,8 @@ public class HttpRedirectTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/someplaceelse", new
BasicValidationHandler(GET.name(), null, null, "Bye World"))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java
index ece20feccae..e675e274289 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java
@@ -33,7 +33,8 @@ public class HttpSOTimeoutTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/", new DelayValidationHandler(GET.name(), null,
null, getExpectedContent(), 2000)).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareBasicAuthTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareBasicAuthTest.java
index f47222cbc82..61d93ee0f8a 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareBasicAuthTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareBasicAuthTest.java
@@ -35,7 +35,8 @@ public class HttpSendDynamicAwareBasicAuthTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/joes", new DrinkAuthValidationHandler(GET.name(),
null, null, "drink")).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareEmptyPathTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareEmptyPathTest.java
index 1fb51b5cf60..a5f4a8f1586 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareEmptyPathTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareEmptyPathTest.java
@@ -32,7 +32,8 @@ public class HttpSendDynamicAwareEmptyPathTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/", new DrinkValidationHandler(GET.name(), null,
null, "drink")).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareHeadersTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareHeadersTest.java
index c7a66302bcc..0926ca3d695 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareHeadersTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareHeadersTest.java
@@ -33,7 +33,8 @@ public class HttpSendDynamicAwareHeadersTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/dynamicAware", new
BasicValidationHandler(GET.name(), "par1=val1&par2=val2", null, null))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareMultiValueTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareMultiValueTest.java
index d9373911a08..5bd1db0bd4d 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareMultiValueTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareMultiValueTest.java
@@ -38,6 +38,7 @@ public class HttpSendDynamicAwareMultiValueTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
localServer = ServerBootstrap.bootstrap()
+ .setCanonicalHostName("localhost")
.setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy())
.setResponseFactory(getHttpResponseFactory())
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwarePathHeaderTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwarePathHeaderTest.java
index 72662acec02..cfe6ba7a95a 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwarePathHeaderTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwarePathHeaderTest.java
@@ -33,7 +33,8 @@ public class HttpSendDynamicAwarePathHeaderTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/mybar", new DrinkValidationHandler(GET.name(),
null, null, "drink")).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawParameterTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawParameterTest.java
index 00ba621261e..fcdac977a09 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawParameterTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawParameterTest.java
@@ -33,6 +33,7 @@ public class HttpSendDynamicAwareRawParameterTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
localServer = ServerBootstrap.bootstrap()
+ .setCanonicalHostName("localhost")
.setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy())
.setResponseFactory(getHttpResponseFactory())
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawTest.java
index 52ba635aa27..4f300c00b88 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareRawTest.java
@@ -37,7 +37,8 @@ public class HttpSendDynamicAwareRawTest extends BaseHttpTest
{
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/moes", new DrinkValidationHandler(GET.name(),
"drink=beer&password=se+%ret", null, "drink"))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareTest.java
index 583304b3322..b85094d6b35 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareTest.java
@@ -33,7 +33,8 @@ public class HttpSendDynamicAwareTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/moes", new DrinkValidationHandler(GET.name(),
null, null, "drink"))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithSpacesTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithSpacesTest.java
index 430e644429c..28f2fb7e204 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithSpacesTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithSpacesTest.java
@@ -36,7 +36,8 @@ public class HttpSendDynamicAwareUriWithSpacesTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/users/*", new BasicValidationHandler("GET", null,
null, "a user")).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
index b2224bf8139..9b9aa9453ae 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareUriWithoutSlashTest.java
@@ -36,7 +36,8 @@ public class HttpSendDynamicAwareUriWithoutSlashTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/users/*", new BasicValidationHandler("GET", null,
null, "a user")).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSetHeaderIdsTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSetHeaderIdsTest.java
index 88e8e286cce..0399bd78670 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSetHeaderIdsTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSetHeaderIdsTest.java
@@ -33,7 +33,8 @@ public class HttpSetHeaderIdsTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/myids", (httpRequest, httpResponse, httpContext)
-> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSquareBracketTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSquareBracketTest.java
index 9e07374a885..4b2bf1ccbfb 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSquareBracketTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSquareBracketTest.java
@@ -32,7 +32,8 @@ public class HttpSquareBracketTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/",
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpStreamCacheNoSpoolToDiskTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpStreamCacheNoSpoolToDiskTest.java
index 03ddaf91a4e..731b4e31463 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpStreamCacheNoSpoolToDiskTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpStreamCacheNoSpoolToDiskTest.java
@@ -37,7 +37,8 @@ public class HttpStreamCacheNoSpoolToDiskTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/test/", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpStreamCacheSpoolToDiskTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpStreamCacheSpoolToDiskTest.java
index f202856d858..f56618f3eff 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpStreamCacheSpoolToDiskTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpStreamCacheSpoolToDiskTest.java
@@ -37,7 +37,8 @@ public class HttpStreamCacheSpoolToDiskTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/test/", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java
index aeef23ec389..aa92fe82bcc 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java
@@ -41,7 +41,8 @@ public class HttpThrowExceptionOnFailureTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/", new BasicValidationHandler(GET.name(), null,
null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpToDSOTimeoutTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpToDSOTimeoutTest.java
index 664009e02f2..addc220d0fb 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpToDSOTimeoutTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpToDSOTimeoutTest.java
@@ -34,7 +34,8 @@ public class HttpToDSOTimeoutTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/foo",
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpWithHttpUriHeaderTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpWithHttpUriHeaderTest.java
index 55b65d755b4..f396c04e143 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpWithHttpUriHeaderTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpWithHttpUriHeaderTest.java
@@ -30,7 +30,8 @@ public class HttpWithHttpUriHeaderTest extends BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/", new BasicValidationHandler(GET.name(), null,
null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
index 49a8f3d1d13..4bddb819374 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
@@ -40,6 +40,7 @@ import
org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.RequestValidateHost;
import org.apache.hc.core5.http.protocol.ResponseContent;
import org.junit.jupiter.api.Test;
@@ -61,7 +62,8 @@ public class HttpsAuthenticationTest extends BaseHttpsTest {
@Override
public final void doPreSetup() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/",
@@ -119,6 +121,7 @@ public class HttpsAuthenticationTest extends BaseHttpsTest {
@Override
protected HttpProcessor getBasicHttpProcessor() {
List<HttpRequestInterceptor> requestInterceptors = new ArrayList<>();
+ requestInterceptors.add(new RequestValidateHost());
requestInterceptors.add(new RequestBasicAuth());
List<HttpResponseInterceptor> responseInterceptors = new ArrayList<>();
responseInterceptors.add(new ResponseContent());
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
index 11f0885816a..50c6aad919e 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
@@ -39,7 +39,8 @@ public class HttpsGetTest extends BaseHttpsTest {
@Override
public void doPreSetup() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/mail/", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsProducerWithSystemPropertiesTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsProducerWithSystemPropertiesTest.java
index dea1a121ac9..ef9f04bb220 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsProducerWithSystemPropertiesTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsProducerWithSystemPropertiesTest.java
@@ -90,7 +90,8 @@ public class HttpsProducerWithSystemPropertiesTest extends
BaseHttpTest {
Map<String, String> expectedHeaders = new HashMap<>();
expectedHeaders.put("User-Agent", "myCoolCamelCaseAgent");
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(sslcontext)
.setSslSetupHandler(socket -> socket.setNeedClientAuth(true))
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsSslContextParametersGetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsSslContextParametersGetTest.java
index e0e9db96147..c8246ee59f9 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsSslContextParametersGetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsSslContextParametersGetTest.java
@@ -30,7 +30,8 @@ public class HttpsSslContextParametersGetTest extends
HttpsGetTest {
@Override
public final void doPreSetup() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/mail/", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent())).create();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
index 897906ceec9..334a6383553 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.http;
+import java.util.Collections;
+
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.jsse.SSLContextParameters;
@@ -23,6 +25,9 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
+import org.apache.hc.core5.http.impl.routing.RequestRouter;
+import org.apache.hc.core5.http.protocol.UriPatternType;
+import org.apache.hc.core5.net.URIAuthority;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -49,7 +54,14 @@ public class HttpsTwoComponentsSslContextParametersGetTest
extends BaseHttpsTest
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+ .setHttpProcessor(getBasicHttpProcessor())
+ .setRequestRouter(RequestRouter.create(
+ new URIAuthority("localhost"),
+ UriPatternType.URI_PATTERN,
+ Collections.EMPTY_LIST,
+ RequestRouter.LOCAL_AUTHORITY_RESOLVER,
+ null))
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext()).create();
localServer.start();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoDifferentSslContextParametersGetTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoDifferentSslContextParametersGetTest.java
index 98f81daa408..196bdfd25e7 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoDifferentSslContextParametersGetTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoDifferentSslContextParametersGetTest.java
@@ -45,7 +45,8 @@ public class HttpsTwoDifferentSslContextParametersGetTest
extends BaseHttpsTest
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext()).create();
localServer.start();
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/ManagedHttpProducerPoolStatsTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/ManagedHttpProducerPoolStatsTest.java
index b92faf71b66..d44c1a19b06 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/ManagedHttpProducerPoolStatsTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/ManagedHttpProducerPoolStatsTest.java
@@ -43,7 +43,8 @@ public class ManagedHttpProducerPoolStatsTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
- localServer =
ServerBootstrap.bootstrap().setHttpProcessor(getBasicHttpProcessor())
+ localServer = ServerBootstrap.bootstrap()
+
.setCanonicalHostName("localhost").setHttpProcessor(getBasicHttpProcessor())
.setConnectionReuseStrategy(getConnectionReuseStrategy()).setResponseFactory(getHttpResponseFactory())
.setSslContext(getSSLContext())
.register("/myapp", (request, response, context) -> {
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/rest/RestCamelComponentVerifierTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/rest/RestCamelComponentVerifierTest.java
index 9cbe3e7589e..1a37cf99ef0 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/rest/RestCamelComponentVerifierTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/rest/RestCamelComponentVerifierTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.http.rest;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -31,6 +30,7 @@ import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
import org.apache.hc.core5.http.protocol.DefaultHttpProcessor;
import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.protocol.RequestValidateHost;
import org.apache.hc.core5.http.protocol.ResponseContent;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -48,6 +48,7 @@ public class RestCamelComponentVerifierTest extends
BaseHttpTest {
@Override
public void setupResources() throws Exception {
localServer = ServerBootstrap.bootstrap()
+ .setCanonicalHostName("localhost")
.setHttpProcessor(getHttpProcessor())
.register("/verify", new BasicValidationHandler(GET.name(),
null, null, getExpectedContent()))
.create();
@@ -81,7 +82,8 @@ public class RestCamelComponentVerifierTest extends
BaseHttpTest {
private HttpProcessor getHttpProcessor() {
return new DefaultHttpProcessor(
- Collections.singletonList(
+ Arrays.asList(
+ new RequestValidateHost(),
new RequestBasicAuth()),
Arrays.asList(
new ResponseContent(),
diff --git a/parent/pom.xml b/parent/pom.xml
index 0dea852f0ec..56690ceda00 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -215,7 +215,7 @@
<hk2-version>2.6.1</hk2-version>
<hsqldb-version>2.7.3</hsqldb-version>
<httpunit-version>1.7</httpunit-version>
- <httpcore-version>5.2.5</httpcore-version>
+ <httpcore-version>5.3</httpcore-version>
<httpclient-version>5.2.1</httpclient-version>
<httpcore4-version>4.4.16</httpcore4-version>
<httpclient4-version>4.5.14</httpclient4-version>
