You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/08 11:16:26 UTC
[camel] 01/21: CAMEL-13792 - Rename components to default names,
Camel-netty4-http to camel-netty-http
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 9dbd15e96432f10dc7f8846a11c99f3125e257df
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 8 10:18:57 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http
---
.../camel/http/common/HttpSendDynamicAware.java | 4 +-
.../pom.xml | 6 +-
.../src/main/docs/netty4-http-component.adoc | 0
.../component/netty4/http/ChunkedHttpRequest.java | 0
.../component/netty4/http/ChunkedHttpResponse.java | 0
.../component/netty4/http/ContextPathMatcher.java | 0
.../netty4/http/CustomChunkedWriteHandler.java | 0
.../netty4/http/DefaultContextPathMatcher.java | 0
.../netty4/http/DefaultNettyHttpBinding.java | 0
.../netty4/http/DefaultNettySharedHttpServer.java | 0
.../netty4/http/HttpClientInitializerFactory.java | 0
.../camel/component/netty4/http/HttpPrincipal.java | 0
.../netty4/http/HttpServerBootstrapFactory.java | 0
.../http/HttpServerConsumerChannelFactory.java | 0
.../netty4/http/HttpServerInitializerFactory.java | 0
.../http/HttpServerSharedInitializerFactory.java | 0
.../netty4/http/JAASSecurityAuthenticator.java | 0
.../netty4/http/NettyChannelBufferStreamCache.java | 0
.../NettyChannelBufferStreamCacheOnCompletion.java | 0
.../component/netty4/http/NettyHttpBinding.java | 0
.../component/netty4/http/NettyHttpComponent.java | 20 ++---
.../netty4/http/NettyHttpConfiguration.java | 0
.../component/netty4/http/NettyHttpConstants.java | 0
.../component/netty4/http/NettyHttpConsumer.java | 0
.../component/netty4/http/NettyHttpConverter.java | 0
.../component/netty4/http/NettyHttpEndpoint.java | 4 +-
.../netty4/http/NettyHttpHeaderFilterStrategy.java | 0
.../component/netty4/http/NettyHttpHelper.java | 0
.../component/netty4/http/NettyHttpMessage.java | 0
.../http/NettyHttpOperationFailedException.java | 0
.../component/netty4/http/NettyHttpProducer.java | 0
.../http/NettyHttpRestHeaderFilterStrategy.java | 0
.../http/NettyHttpSecurityConfiguration.java | 0
.../netty4/http/NettyHttpSendDynamicAware.java | 2 +-
.../netty4/http/NettySharedHttpServer.java | 0
...ettySharedHttpServerBootstrapConfiguration.java | 0
.../netty4/http/RestContextPathMatcher.java | 0
.../netty4/http/RestNettyHttpBinding.java | 0
.../netty4/http/SecurityAuthenticator.java | 0
.../netty4/http/SecurityAuthenticatorSupport.java | 0
.../component/netty4/http/SecurityConstraint.java | 0
.../netty4/http/SecurityConstraintMapping.java | 0
.../http/cloud/Netty4HttpServiceExpression.java | 2 +-
.../cloud/Netty4HttpServiceExpressionFactory.java | 2 +-
.../http/handlers/HttpClientChannelHandler.java | 0
.../netty4/http/handlers/HttpRestConsumerPath.java | 0
.../http/handlers/HttpServerChannelHandler.java | 0
.../HttpServerMultiplexChannelHandler.java | 0
.../camel/component/netty4/http/BaseNettyTest.java | 0
.../component/netty4/http/LogCaptureAppender.java | 0
.../component/netty4/http/LogCaptureTest.java | 0
.../netty4/http/ManagedNettyEndpointTest.java | 4 +-
.../camel/component/netty4/http/MyLoginModule.java | 0
.../component/netty4/http/MyRolePrincipal.java | 0
.../netty4/http/NettyCamelWebsiteTest.java | 2 +-
.../netty4/http/NettyDefaultProtocolTest.java | 4 +-
.../netty4/http/NettyHttp500ErrorTest.java | 8 +-
...ettyHttp500ErrorThrowExceptionOnServerTest.java | 6 +-
...tyHttpAccessHttpRequestAndResponseBeanTest.java | 6 +-
.../http/NettyHttpAccessHttpRequestBeanTest.java | 4 +-
.../http/NettyHttpAccessHttpRequestTest.java | 4 +-
.../NettyHttpBasicAuthConstraintMapperTest.java | 8 +-
...tpBasicAuthCustomSecurityAuthenticatorTest.java | 6 +-
.../netty4/http/NettyHttpBasicAuthTest.java | 8 +-
...pBindingPreservePostFormUrlEncodedBodyTest.java | 4 +-
.../http/NettyHttpBindingUseAbsolutePathTest.java | 10 +--
.../NettyHttpBindingUseRelativePathInPostTest.java | 4 +-
.../http/NettyHttpBindingUseRelativePathTest.java | 10 +--
.../http/NettyHttpBridgeEncodedPathTest.java | 12 +--
.../NettyHttpBridgeRouteUsingHttpClientTest.java | 6 +-
.../http/NettyHttpCharacterEncodingTest.java | 4 +-
.../netty4/http/NettyHttpClientChunkedTest.java | 4 +-
.../http/NettyHttpClientExpectContinueTest.java | 4 +-
.../netty4/http/NettyHttpCompressTest.java | 4 +-
.../netty4/http/NettyHttpContentTypeTest.java | 8 +-
.../NettyHttpConvertPayloadToInputStreamTest.java | 4 +-
.../netty4/http/NettyHttpCustomOptionsTest.java | 4 +-
.../http/NettyHttpEmptyQueryParameterTest.java | 6 +-
...pEndpointUriCustomHeaderFilterStrategyTest.java | 4 +-
.../NettyHttpEndpointUriEncodingIssueTest.java | 6 +-
...pointUriEncodingIssueUrlDecodeDisabledTest.java | 4 +-
.../http/NettyHttpFilterCamelHeadersTest.java | 4 +-
.../http/NettyHttpGetWithInvalidMessageTest.java | 2 +-
.../NettyHttpGetWithParamAsExchangeHeaderTest.java | 2 +-
.../netty4/http/NettyHttpGetWithParamTest.java | 2 +-
.../netty4/http/NettyHttpHandle404Test.java | 4 +-
.../netty4/http/NettyHttpHeaderCaseTest.java | 2 +-
.../NettyHttpHeaderFilterStrategyRemovalTest.java | 6 +-
.../http/NettyHttpHeaderFilterStrategyTest.java | 0
.../netty4/http/NettyHttpHeaderMaxSizeTest.java | 2 +-
.../netty4/http/NettyHttpHeadersTest.java | 4 +-
.../netty4/http/NettyHttpMapHeadersFalseTest.java | 2 +-
.../netty4/http/NettyHttpMethodRestrictTest.java | 2 +-
.../netty4/http/NettyHttpOkStatusCodeTest.java | 10 +--
.../http/NettyHttpOnExceptionHandledTest.java | 4 +-
.../NettyHttpOperationFailedExceptionTest.java | 0
.../netty4/http/NettyHttpProducerBridgeTest.java | 14 ++--
.../http/NettyHttpProducerConcurrentTest.java | 4 +-
.../netty4/http/NettyHttpProducerHeadersTest.java | 0
.../http/NettyHttpProducerKeepAliveTest.java | 14 ++--
.../http/NettyHttpProducerQueryParamTest.java | 2 +-
.../http/NettyHttpProducerSendEmptyHeaderTest.java | 4 +-
.../netty4/http/NettyHttpProducerSessionTest.java | 10 +--
.../http/NettyHttpProducerSimpleGetTest.java | 10 +--
.../netty4/http/NettyHttpProducerSimpleTest.java | 6 +-
...ttyHttpProducerThrowExceptionOnFailureTest.java | 6 +-
...tyHttpProducerTwoParametersWithSameKeyTest.java | 6 +-
.../http/NettyHttpProducerWithHeaderTest.java | 6 +-
.../netty4/http/NettyHttpProtocolNoSlashTest.java | 4 +-
.../netty4/http/NettyHttpRawQueryTest.java | 2 +-
.../netty4/http/NettyHttpRedeliveryTest.java | 4 +-
.../http/NettyHttpRedirectNoLocationTest.java | 4 +-
.../netty4/http/NettyHttpRedirectTest.java | 4 +-
.../netty4/http/NettyHttpRequestTimeoutTest.java | 4 +-
.../http/NettyHttpRestContextPathMatcherTest.java | 20 ++---
.../netty4/http/NettyHttpRestOptionsAllowTest.java | 4 +-
...ttpReturnDataNotInputStreamConvertableTest.java | 4 +-
.../http/NettyHttpSSLHandshakeErrorTest.java | 4 +-
.../component/netty4/http/NettyHttpSSLTest.java | 2 +-
.../NettyHttpSameHostDifferentParametersTest.java | 6 +-
.../netty4/http/NettyHttpSendDynamicAwareTest.java | 10 +--
...ttyHttpSimpleBasicAuthConstraintMapperTest.java | 8 +-
.../netty4/http/NettyHttpSimpleBasicAuthTest.java | 8 +-
.../component/netty4/http/NettyHttpSimpleTest.java | 4 +-
.../http/NettyHttpSimpleUriParametersTest.java | 4 +-
.../http/NettyHttpStreamCacheFileResponseTest.java | 2 +-
.../netty4/http/NettyHttpSuspendResume503Test.java | 2 +-
.../netty4/http/NettyHttpSuspendResumeTest.java | 2 +-
.../netty4/http/NettyHttpTraceDisabledTest.java | 4 +-
.../http/NettyHttpTransferExceptionTest.java | 4 +-
...ttyHttpTwoRoutesBootstrapConfigurationTest.java | 10 +--
.../NettyHttpTwoRoutesMatchOnUriPrefixTest.java | 14 ++--
.../http/NettyHttpTwoRoutesStopOneRouteTest.java | 12 +--
.../netty4/http/NettyHttpTwoRoutesTest.java | 8 +-
...woRoutesValidateBootstrapConfigurationTest.java | 4 +-
.../netty4/http/NettyHttpXMLXPathResponseTest.java | 8 +-
.../netty4/http/NettyHttpXMLXPathTest.java | 8 +-
.../component/netty4/http/NettyMDCLoggingTest.java | 4 +-
.../netty4/http/NettyMixedCaseHttpPathTest.java | 4 +-
.../netty4/http/NettyProxyMixedCasePathTest.java | 8 +-
.../http/NettyRecipientListHttpBaseTest.java | 4 +-
.../netty4/http/NettyRequestManagementTest.java | 4 +-
.../http/NettyRouteSimpleDynamicURITest.java | 8 +-
.../netty4/http/NettyRouteSimpleTest.java | 8 +-
.../netty4/http/NettySharedHttpServerTest.java | 8 +-
.../netty4/http/NettyUseRawHttpResponseTest.java | 4 +-
.../component/netty4/http/ProxyProtocolTest.java | 0
.../netty4/http/SecurityConstraintMappingTest.java | 0
.../netty4/http/SpringNettyHttpBasicAuthTest.java | 14 ++--
.../netty4/http/SpringNettyHttpSSLTest.java | 0
.../http/cloud/Netty4HttpServiceCallRouteTest.java | 6 +-
.../component/netty4/http/rest/CountryPojo.java | 0
.../netty4/http/rest/RestApiNettyTest.java | 4 +-
.../RestNettyHttpBindingModeAutoWithJsonTest.java | 4 +-
.../RestNettyHttpBindingModeAutoWithXmlTest.java | 4 +-
.../rest/RestNettyHttpBindingModeJsonTest.java | 6 +-
...stNettyHttpBindingModeJsonWithContractTest.java | 4 +-
...estNettyHttpBindingModeOffWithContractTest.java | 4 +-
.../http/rest/RestNettyHttpBindingModeXmlTest.java | 6 +-
.../RestNettyHttpContextPathConfigurationTest.java | 8 +-
.../rest/RestNettyHttpContextPathMatchGetTest.java | 8 +-
.../netty4/http/rest/RestNettyHttpGetCorsTest.java | 4 +-
.../netty4/http/rest/RestNettyHttpGetTest.java | 6 +-
.../http/rest/RestNettyHttpGetWildcardsTest.java | 8 +-
.../netty4/http/rest/RestNettyHttpOptionsTest.java | 2 +-
.../http/rest/RestNettyHttpPojoInOutTest.java | 8 +-
.../rest/RestNettyHttpPostJsonJaxbPojoTest.java | 6 +-
.../rest/RestNettyHttpPostJsonPojoListTest.java | 6 +-
.../http/rest/RestNettyHttpPostJsonPojoTest.java | 6 +-
.../rest/RestNettyHttpPostXmlJaxbPojoTest.java | 8 +-
.../netty4/http/rest/RestNettyHttpVerbTest.java | 2 +-
.../http/rest/RestNettyMethodNotAllowedTest.java | 2 +-
.../netty4/http/rest/RestNettyProducerGetTest.java | 2 +-
.../rest/RestNettyProducerGetUriParameterTest.java | 2 +-
.../netty4/http/rest/RestNettyProducerPutTest.java | 2 +-
.../RestNettyProducerThrowExceptionErrorTest.java | 2 +-
.../rest/RestNettyProducerVerbUpperCaseTest.java | 2 +-
.../netty4/http/rest/RestPathMatchingTest.java | 0
.../component/netty4/http/rest/UserJaxbPojo.java | 0
.../camel/component/netty4/http/rest/UserPojo.java | 0
.../component/netty4/http/rest/UserPojoEx.java | 0
.../component/netty4/http/rest/UserService.java | 0
.../src/test/resources/jsse/client-keystore.jks | Bin
.../src/test/resources/jsse/client-truststore.jks | Bin
.../src/test/resources/jsse/localhost.ks | Bin
.../src/test/resources/jsse/server-keystore.jks | Bin
.../src/test/resources/jsse/server-truststore.jks | Bin
.../src/test/resources/log4j2.properties | 2 +-
.../src/test/resources/myjaas.config | 0
.../netty4/http/SpringNettyHttpBasicAuthTest.xml | 2 +-
.../netty4/http/SpringNettyHttpSSLTest.xml | 2 +-
.../dsl/NettyHttpEndpointBuilderFactory.java | 16 ++--
.../pom.xml | 16 +---
.../NettyHttpComponentAutoConfiguration.java | 8 +-
.../NettyHttpComponentConfiguration.java | 6 +-
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 1 +
.../src/main/resources/META-INF/spring.provides | 2 +-
.../additional-spring-configuration-metadata.json | 10 ---
.../Netty4HttpAutoConfigurationTest.java | 79 --------------------
.../netty4/http/springboot/Netty4HttpSSLTest.java | 81 ---------------------
.../http/springboot/Netty4StarterTestHelper.java | 62 ----------------
.../src/test/resources/application.properties | 18 -----
.../src/test/resources/cacerts | Bin 109798 -> 0 bytes
.../src/test/resources/keystore.p12 | Bin 2574 -> 0 bytes
.../src/test/resources/logback.xml | 41 -----------
platforms/spring-boot/components-starter/pom.xml | 1 +
208 files changed, 369 insertions(+), 666 deletions(-)
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpSendDynamicAware.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpSendDynamicAware.java
index f4ba371..929964a 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpSendDynamicAware.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpSendDynamicAware.java
@@ -77,8 +77,8 @@ public class HttpSendDynamicAware implements SendDynamicAware {
params.put("httpUri", host);
} else if (params.containsKey("httpURI")) {
params.put("httpURI", host);
- } else if ("netty4-http".equals(scheme)) {
- // the netty4-http stores host,port etc in other fields than httpURI so we can just remove the path parameter
+ } else if ("netty-http".equals(scheme)) {
+ // the netty-http stores host,port etc in other fields than httpURI so we can just remove the path parameter
params.remove("path");
}
}
diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty-http/pom.xml
similarity index 97%
rename from components/camel-netty4-http/pom.xml
rename to components/camel-netty-http/pom.xml
index e0f1e77..6bbb919 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -27,10 +27,10 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-netty4-http</artifactId>
+ <artifactId>camel-netty-http</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Netty4 HTTP</name>
- <description>Camel Netty4 HTTP support</description>
+ <name>Camel :: Netty HTTP</name>
+ <description>Camel Netty HTTP support</description>
<properties>
</properties>
diff --git a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc b/components/camel-netty-http/src/main/docs/netty4-http-component.adoc
similarity index 100%
rename from components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
rename to components/camel-netty-http/src/main/docs/netty4-http-component.adoc
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/ChunkedHttpRequest.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/ChunkedHttpRequest.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/ChunkedHttpRequest.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/ChunkedHttpRequest.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/ChunkedHttpResponse.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/ChunkedHttpResponse.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/ChunkedHttpResponse.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/ChunkedHttpResponse.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/ContextPathMatcher.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/ContextPathMatcher.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/ContextPathMatcher.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/ContextPathMatcher.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/CustomChunkedWriteHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/CustomChunkedWriteHandler.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/CustomChunkedWriteHandler.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/CustomChunkedWriteHandler.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultContextPathMatcher.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/DefaultContextPathMatcher.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultContextPathMatcher.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/DefaultContextPathMatcher.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettySharedHttpServer.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettySharedHttpServer.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettySharedHttpServer.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettySharedHttpServer.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpClientInitializerFactory.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpClientInitializerFactory.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpClientInitializerFactory.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpClientInitializerFactory.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpPrincipal.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpPrincipal.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpPrincipal.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpPrincipal.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerBootstrapFactory.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerBootstrapFactory.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerBootstrapFactory.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerBootstrapFactory.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerConsumerChannelFactory.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerConsumerChannelFactory.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerConsumerChannelFactory.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerConsumerChannelFactory.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerInitializerFactory.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerInitializerFactory.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerInitializerFactory.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerInitializerFactory.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerSharedInitializerFactory.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerSharedInitializerFactory.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerSharedInitializerFactory.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/HttpServerSharedInitializerFactory.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/JAASSecurityAuthenticator.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/JAASSecurityAuthenticator.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/JAASSecurityAuthenticator.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/JAASSecurityAuthenticator.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyChannelBufferStreamCache.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyChannelBufferStreamCache.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyChannelBufferStreamCache.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyChannelBufferStreamCache.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyChannelBufferStreamCacheOnCompletion.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyChannelBufferStreamCacheOnCompletion.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyChannelBufferStreamCacheOnCompletion.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyChannelBufferStreamCacheOnCompletion.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpBinding.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpBinding.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpBinding.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpBinding.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
similarity index 97%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
index 312cbed..8eadd9f 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
@@ -52,7 +52,7 @@ import org.apache.camel.util.UnsafeUriCharactersEncoder;
/**
* Netty HTTP based component.
*/
-@Component("netty-http,netty4-http")
+@Component("netty-http")
public class NettyHttpComponent extends NettyComponent implements HeaderFilterStrategyAware, RestConsumerFactory, RestApiConsumerFactory, RestProducerFactory, SSLContextParametersAware {
// factories which is created by this component and therefore manage their lifecycles
@@ -345,7 +345,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
// if no explicit port/host configured, then use port from rest configuration
RestConfiguration config = configuration;
if (config == null) {
- config = camelContext.getRestConfiguration("netty4-http", true);
+ config = camelContext.getRestConfiguration("netty-http", true);
}
if (config.getScheme() != null) {
scheme = config.getScheme();
@@ -381,7 +381,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
Map<String, Object> map = new HashMap<>();
// build query string, and append any endpoint configuration properties
- if (config.getComponent() == null || config.getComponent().equals("netty4-http")) {
+ if (config.getComponent() == null || config.getComponent().equals("netty-http")) {
// setup endpoint options
if (config.getEndpointProperties() != null && !config.getEndpointProperties().isEmpty()) {
map.putAll(config.getEndpointProperties());
@@ -395,9 +395,9 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
String url;
if (api) {
- url = "netty4-http:%s://%s:%s/%s?matchOnUriPrefix=true&httpMethodRestrict=%s";
+ url = "netty-http:%s://%s:%s/%s?matchOnUriPrefix=true&httpMethodRestrict=%s";
} else {
- url = "netty4-http:%s://%s:%s/%s?httpMethodRestrict=%s";
+ url = "netty-http:%s://%s:%s/%s?httpMethodRestrict=%s";
}
// must use upper case for restrict
String restrict = verb.toUpperCase(Locale.US);
@@ -433,7 +433,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
uriTemplate = FileUtil.stripLeadingSeparator(uriTemplate);
// get the endpoint
- String url = "netty4-http:" + host;
+ String url = "netty-http:" + host;
if (!ObjectHelper.isEmpty(basePath)) {
url += "/" + basePath;
}
@@ -443,12 +443,12 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
RestConfiguration config = configuration;
if (config == null) {
- config = camelContext.getRestConfiguration("netty4-http", true);
+ config = camelContext.getRestConfiguration("netty-http", true);
}
Map<String, Object> map = new HashMap<>();
// build query string, and append any endpoint configuration properties
- if (config.getComponent() == null || config.getComponent().equals("netty4-http")) {
+ if (config.getComponent() == null || config.getComponent().equals("netty-http")) {
// setup endpoint options
if (config.getEndpointProperties() != null && !config.getEndpointProperties().isEmpty()) {
map.putAll(config.getEndpointProperties());
@@ -487,8 +487,8 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
protected void doStart() throws Exception {
super.doStart();
- RestConfiguration config = getCamelContext().getRestConfiguration("netty4-http", true);
- // configure additional options on netty4-http configuration
+ RestConfiguration config = getCamelContext().getRestConfiguration("netty-http", true);
+ // configure additional options on netty-http configuration
if (config.getComponentProperties() != null && !config.getComponentProperties().isEmpty()) {
setProperties(this, config.getComponentProperties());
}
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConstants.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConstants.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConstants.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConstants.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConsumer.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConsumer.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConsumer.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConsumer.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConverter.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConverter.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConverter.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConverter.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
similarity index 97%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
index ca6fdcb..876513f 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
@@ -41,8 +41,8 @@ import org.apache.camel.util.StringHelper;
/**
* Netty HTTP server and client using the Netty 4.x library.
*/
-@UriEndpoint(firstVersion = "2.14.0", scheme = "netty4-http,netty-http", extendsScheme = "netty", title = "Netty4 HTTP",
- syntax = "netty4-http:protocol:host:port/path", label = "http", lenientProperties = true,
+@UriEndpoint(firstVersion = "2.14.0", scheme = "netty-http", extendsScheme = "netty", title = "Netty HTTP",
+ syntax = "netty-http:protocol:host:port/path", label = "http", lenientProperties = true,
excludeProperties = "textline,delimiter,autoAppendDelimiter,decoderMaxLineLength,encoding,allowDefaultCodec,udpConnectionlessSending,networkInterface"
+ ",clientMode,reconnect,reconnectInterval,useByteBuf,udpByteArrayCodec,broadcast,correlationManager")
public class NettyHttpEndpoint extends NettyEndpoint implements AsyncEndpoint, HeaderFilterStrategyAware {
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategy.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategy.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategy.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategy.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpMessage.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpMessage.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpMessage.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpMessage.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpRestHeaderFilterStrategy.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpRestHeaderFilterStrategy.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpRestHeaderFilterStrategy.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpRestHeaderFilterStrategy.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSecurityConfiguration.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSecurityConfiguration.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSecurityConfiguration.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSecurityConfiguration.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java
similarity index 98%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java
index 59ea2c0..18b14c1 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.netty4.http;
import org.apache.camel.http.common.HttpSendDynamicAware;
import org.apache.camel.spi.annotations.SendDynamic;
-@SendDynamic("netty4-http")
+@SendDynamic("netty-http")
public class NettyHttpSendDynamicAware extends HttpSendDynamicAware {
@Override
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettySharedHttpServer.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettySharedHttpServer.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettySharedHttpServer.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettySharedHttpServer.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettySharedHttpServerBootstrapConfiguration.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettySharedHttpServerBootstrapConfiguration.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettySharedHttpServerBootstrapConfiguration.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/NettySharedHttpServerBootstrapConfiguration.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/RestContextPathMatcher.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/RestContextPathMatcher.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/RestContextPathMatcher.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/RestContextPathMatcher.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/RestNettyHttpBinding.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/RestNettyHttpBinding.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/RestNettyHttpBinding.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/RestNettyHttpBinding.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticator.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticator.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticator.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticator.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticatorSupport.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticatorSupport.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticatorSupport.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticatorSupport.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityConstraint.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/SecurityConstraint.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityConstraint.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/SecurityConstraint.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityConstraintMapping.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/SecurityConstraintMapping.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/SecurityConstraintMapping.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/SecurityConstraintMapping.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpression.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpression.java
similarity index 96%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpression.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpression.java
index 726d47e..b9e7ddf 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpression.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpression.java
@@ -29,7 +29,7 @@ public final class Netty4HttpServiceExpression extends DefaultServiceCallExpress
@Override
protected String doBuildCamelEndpointUri(String host, Integer port, String contextPath, String scheme) {
- if (!ObjectHelper.equal(scheme, "netty4-http")) {
+ if (!ObjectHelper.equal(scheme, "netty-http")) {
return super.doBuildCamelEndpointUri(host, port, contextPath, scheme);
}
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpressionFactory.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpressionFactory.java
similarity index 95%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpressionFactory.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpressionFactory.java
index c27de68..3ad7eb5 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpressionFactory.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpressionFactory.java
@@ -21,7 +21,7 @@ import org.apache.camel.Expression;
import org.apache.camel.cloud.ServiceExpressionFactory;
import org.apache.camel.spi.annotations.CloudServiceFactory;
-@CloudServiceFactory("netty4-http-service-expression")
+@CloudServiceFactory("netty-http-service-expression")
public class Netty4HttpServiceExpressionFactory implements ServiceExpressionFactory {
@Override
public Expression newInstance(CamelContext camelContext) throws Exception {
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpClientChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpClientChannelHandler.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpClientChannelHandler.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpClientChannelHandler.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpRestConsumerPath.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpRestConsumerPath.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpRestConsumerPath.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpRestConsumerPath.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java
similarity index 100%
rename from components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java
rename to components/camel-netty-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureAppender.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureAppender.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureAppender.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureAppender.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureTest.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureTest.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/ManagedNettyEndpointTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/ManagedNettyEndpointTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/ManagedNettyEndpointTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/ManagedNettyEndpointTest.java
index c333114..4788b85 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/ManagedNettyEndpointTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/ManagedNettyEndpointTest.java
@@ -53,7 +53,7 @@ public class ManagedNettyEndpointTest extends BaseNettyTest {
// should not add 10 endpoints
getMockEndpoint("mock:foo").expectedMessageCount(10);
for (int i = 0; i < 10; i++) {
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo?param" + i + "=value" + i, "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo?param" + i + "=value" + i, "Hello World", String.class);
assertEquals("param" + i + "=value" + i, out);
}
assertMockEndpointsSatisfied();
@@ -73,7 +73,7 @@ public class ManagedNettyEndpointTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:foo")
.transform().header(Exchange.HTTP_QUERY);
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/MyLoginModule.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/MyLoginModule.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/MyLoginModule.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/MyLoginModule.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/MyRolePrincipal.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/MyRolePrincipal.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/MyRolePrincipal.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/MyRolePrincipal.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
index 93296f6..4ce350d 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
@@ -41,7 +41,7 @@ public class NettyCamelWebsiteTest extends CamelTestSupport {
public void configure() throws Exception {
from("direct:in")
.setHeader(Exchange.HTTP_METHOD, constant("GET"))
- .to("netty4-http:http://camel.apache.org/")
+ .to("netty-http:http://camel.apache.org/")
.to("log:test")
.to("mock:test");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyDefaultProtocolTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyDefaultProtocolTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyDefaultProtocolTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyDefaultProtocolTest.java
index 38d2934..02aeb29 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyDefaultProtocolTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyDefaultProtocolTest.java
@@ -33,7 +33,7 @@ public class NettyDefaultProtocolTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_QUERY, "beer=yes");
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_PATH, "");
- String out = template.requestBody("netty4-http:localhost:{{port}}/foo?beer=yes", "Hello World", String.class);
+ String out = template.requestBody("netty-http:localhost:{{port}}/foo?beer=yes", "Hello World", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -44,7 +44,7 @@ public class NettyDefaultProtocolTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http:localhost:{{port}}/foo")
+ from("netty-http:http:localhost:{{port}}/foo")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorTest.java
similarity index 86%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorTest.java
index 8b8a429..0b7f75b 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorTest.java
@@ -29,7 +29,7 @@ public class NettyHttp500ErrorTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
fail("Should have failed");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -44,7 +44,7 @@ public class NettyHttp500ErrorTest extends BaseNettyTest {
public void testHttp500ErrorDisabled() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- String body = template.requestBody("netty4-http:http://localhost:{{port}}/foo?throwExceptionOnFailure=false", "Hello World", String.class);
+ String body = template.requestBody("netty-http:http://localhost:{{port}}/foo?throwExceptionOnFailure=false", "Hello World", String.class);
assertEquals("Camel cannot do this", body);
assertMockEndpointsSatisfied();
@@ -54,7 +54,7 @@ public class NettyHttp500ErrorTest extends BaseNettyTest {
public void testHttp500ErrorDisabledStatusCode() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- Exchange out = template.request("netty4-http:http://localhost:{{port}}/foo?throwExceptionOnFailure=false", new Processor() {
+ Exchange out = template.request("netty-http:http://localhost:{{port}}/foo?throwExceptionOnFailure=false", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("Hello World");
@@ -73,7 +73,7 @@ public class NettyHttp500ErrorTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
// trigger failure by setting error code to 500
.setHeader(Exchange.HTTP_RESPONSE_CODE, constant(500))
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
similarity index 88%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
index fa41d0f..4155921 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java
@@ -27,7 +27,7 @@ public class NettyHttp500ErrorThrowExceptionOnServerTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
fail("Should have failed");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -45,7 +45,7 @@ public class NettyHttp500ErrorThrowExceptionOnServerTest extends BaseNettyTest {
public void testHttp500ErrorDisabled() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- String body = template.requestBody("netty4-http:http://localhost:{{port}}/foo?throwExceptionOnFailure=false", "Hello World", String.class);
+ String body = template.requestBody("netty-http:http://localhost:{{port}}/foo?throwExceptionOnFailure=false", "Hello World", String.class);
assertTrue(body.startsWith("java.lang.IllegalArgumentException: Camel cannot do this"));
assertMockEndpointsSatisfied();
@@ -57,7 +57,7 @@ public class NettyHttp500ErrorThrowExceptionOnServerTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.throwException(new IllegalArgumentException("Camel cannot do this"));
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
similarity index 90%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
index 9fbc6ee..d9c1713 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java
@@ -34,10 +34,10 @@ public class NettyHttpAccessHttpRequestAndResponseBeanTest extends BaseNettyTest
public void testRawHttpRequestAndResponseInBean() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("World", "Camel");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "World", String.class);
assertEquals("Bye World", out);
- String out2 = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Camel", String.class);
+ String out2 = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Camel", String.class);
assertEquals("Bye Camel", out2);
assertMockEndpointsSatisfied();
@@ -48,7 +48,7 @@ public class NettyHttpAccessHttpRequestAndResponseBeanTest extends BaseNettyTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.transform().method(NettyHttpAccessHttpRequestAndResponseBeanTest.class, "myTransformer");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
similarity index 91%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
index 2f86568d..ab60cb6 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java
@@ -28,7 +28,7 @@ public class NettyHttpAccessHttpRequestBeanTest extends BaseNettyTest {
public void testAccessHttpRequest() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("World");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "World", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -39,7 +39,7 @@ public class NettyHttpAccessHttpRequestBeanTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.transform().method(NettyHttpAccessHttpRequestBeanTest.class, "myTransformer");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestTest.java
index a3ca9ad..6f31290 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestTest.java
@@ -28,7 +28,7 @@ public class NettyHttpAccessHttpRequestTest extends BaseNettyTest {
public void testAccessHttpRequest() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -39,7 +39,7 @@ public class NettyHttpAccessHttpRequestTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.process(new Processor() {
@Override
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthConstraintMapperTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthConstraintMapperTest.java
similarity index 86%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthConstraintMapperTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthConstraintMapperTest.java
index 87c0259..bb7aabe 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthConstraintMapperTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthConstraintMapperTest.java
@@ -60,11 +60,11 @@ public class NettyHttpBasicAuthConstraintMapperTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello Public", "Hello World");
// we dont need auth for the public page
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo/public/hello.txt", "Hello Public", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo/public/hello.txt", "Hello Public", String.class);
assertEquals("Bye World", out);
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
fail("Should send back 401");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -76,7 +76,7 @@ public class NettyHttpBasicAuthConstraintMapperTest extends BaseNettyTest {
// username:password is scott:secret
String auth = "Basic c2NvdHQ6c2VjcmV0";
- out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
+ out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -87,7 +87,7 @@ public class NettyHttpBasicAuthConstraintMapperTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo?matchOnUriPrefix=true&securityConfiguration=#mySecurityConfig")
+ from("netty-http:http://0.0.0.0:{{port}}/foo?matchOnUriPrefix=true&securityConfiguration=#mySecurityConfig")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java
similarity index 88%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java
index 63a4a53..2bcf98e 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java
@@ -32,7 +32,7 @@ public class NettyHttpBasicAuthCustomSecurityAuthenticatorTest extends BaseNetty
@Test
public void testBasicAuth() throws Exception {
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
fail("Should send back 401");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -47,7 +47,7 @@ public class NettyHttpBasicAuthCustomSecurityAuthenticatorTest extends BaseNetty
// username:password is scott:secret
String auth = "Basic c2NvdHQ6c2VjcmV0";
- String out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
+ String out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -58,7 +58,7 @@ public class NettyHttpBasicAuthCustomSecurityAuthenticatorTest extends BaseNetty
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo?securityConfiguration.realm=foo&securityConfiguration.securityAuthenticator=#myAuthenticator").to("mock:input")
+ from("netty-http:http://0.0.0.0:{{port}}/foo?securityConfiguration.realm=foo&securityConfiguration.securityAuthenticator=#myAuthenticator").to("mock:input")
.transform().constant("Bye World");
}
};
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthTest.java
similarity index 87%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthTest.java
index d4260bd..3c780aa 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthTest.java
@@ -53,7 +53,7 @@ public class NettyHttpBasicAuthTest extends BaseNettyTest {
@Test
public void testBasicAuthFailed() throws Exception {
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
fail("Should send back 401");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -70,7 +70,7 @@ public class NettyHttpBasicAuthTest extends BaseNettyTest {
// username:password is scott:secret
String auth = "Basic c2NvdHQ6c2VjcmV0";
- String out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
+ String out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -82,7 +82,7 @@ public class NettyHttpBasicAuthTest extends BaseNettyTest {
try {
// password is invalid so we should get a 401
String auth = "Basic c2NvdHQ6dHlwbw==";
- template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
+ template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
assertEquals(401, cause.getStatusCode());
@@ -94,7 +94,7 @@ public class NettyHttpBasicAuthTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo?securityConfiguration=#mySecurityConfig")
+ from("netty-http:http://0.0.0.0:{{port}}/foo?securityConfiguration=#mySecurityConfig")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java
similarity index 93%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java
index 97e8568..75fe84f 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java
@@ -28,7 +28,7 @@ public class NettyHttpBindingPreservePostFormUrlEncodedBodyTest extends BaseNett
@Test
public void testSendToNetty() throws Exception {
- Exchange exchange = template.request("netty4-http:http://localhost:{{port}}/myapp/myservice?query1=a&query2=b", new Processor() {
+ Exchange exchange = template.request("netty-http:http://localhost:{{port}}/myapp/myservice?query1=a&query2=b", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("b1=x&b2=y");
@@ -46,7 +46,7 @@ public class NettyHttpBindingPreservePostFormUrlEncodedBodyTest extends BaseNett
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/myapp/myservice").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}/myapp/myservice").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseAbsolutePathTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseAbsolutePathTest.java
similarity index 88%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseAbsolutePathTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseAbsolutePathTest.java
index a6d29fa..482b88b 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseAbsolutePathTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseAbsolutePathTest.java
@@ -28,7 +28,7 @@ public class NettyHttpBindingUseAbsolutePathTest extends BaseNettyTest {
@Test
public void testSendToNettyWithPath() throws Exception {
- Exchange exchange = template.request("netty4-http:http://localhost:{{port}}/mypath?useRelativePath=false", new Processor() {
+ Exchange exchange = template.request("netty-http:http://localhost:{{port}}/mypath?useRelativePath=false", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.POST);
}
@@ -41,7 +41,7 @@ public class NettyHttpBindingUseAbsolutePathTest extends BaseNettyTest {
@Test
public void testSendToNettyWithoutPath() throws Exception {
- Exchange exchange = template.request("netty4-http:http://localhost:{{port}}?useRelativePath=false", new Processor() {
+ Exchange exchange = template.request("netty-http:http://localhost:{{port}}?useRelativePath=false", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.POST);
}
@@ -54,7 +54,7 @@ public class NettyHttpBindingUseAbsolutePathTest extends BaseNettyTest {
@Test
public void testSendToNettyWithoutPath2() throws Exception {
- Exchange exchange = template.request("netty4-http:http://localhost:{{port}}/?useRelativePath=false", new Processor() {
+ Exchange exchange = template.request("netty-http:http://localhost:{{port}}/?useRelativePath=false", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.POST);
}
@@ -69,7 +69,7 @@ public class NettyHttpBindingUseAbsolutePathTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/mypath").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}/mypath").process(new Processor() {
public void process(Exchange exchange) throws Exception {
assertEquals("Get a wrong form parameter from the message header", "localhost:" + getPort(), exchange.getIn().getHeader("host"));
@@ -84,7 +84,7 @@ public class NettyHttpBindingUseAbsolutePathTest extends BaseNettyTest {
}
});
- from("netty4-http:http://localhost:{{port}}").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}").process(new Processor() {
public void process(Exchange exchange) throws Exception {
assertEquals("Get a wrong form parameter from the message header", "localhost:" + getPort(), exchange.getIn().getHeader("host"));
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java
similarity index 93%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java
index f059393..a6a7cf3 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java
@@ -28,7 +28,7 @@ public class NettyHttpBindingUseRelativePathInPostTest extends BaseNettyTest {
@Test
public void testSendToNetty() throws Exception {
- Exchange exchange = template.request("netty4-http:http://localhost:{{port}}/myapp/myservice?query1=a&query2=b&useRelativePath=true", new Processor() {
+ Exchange exchange = template.request("netty-http:http://localhost:{{port}}/myapp/myservice?query1=a&query2=b&useRelativePath=true", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("b1=x&b2=y");
@@ -46,7 +46,7 @@ public class NettyHttpBindingUseRelativePathInPostTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/myapp/myservice").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}/myapp/myservice").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathTest.java
similarity index 89%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathTest.java
index 73faa91..1864bd7 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathTest.java
@@ -28,7 +28,7 @@ public class NettyHttpBindingUseRelativePathTest extends BaseNettyTest {
@Test
public void testSendToNettyWithPath() throws Exception {
- Exchange exchange = template.request("netty4-http:http://localhost:{{port}}/mypath", new Processor() {
+ Exchange exchange = template.request("netty-http:http://localhost:{{port}}/mypath", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.POST);
}
@@ -41,7 +41,7 @@ public class NettyHttpBindingUseRelativePathTest extends BaseNettyTest {
@Test
public void testSendToNettyWithoutPath() throws Exception {
- Exchange exchange = template.request("netty4-http:http://localhost:{{port}}", new Processor() {
+ Exchange exchange = template.request("netty-http:http://localhost:{{port}}", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.POST);
}
@@ -54,7 +54,7 @@ public class NettyHttpBindingUseRelativePathTest extends BaseNettyTest {
@Test
public void testSendToNettyWithoutPath2() throws Exception {
- Exchange exchange = template.request("netty4-http:http://localhost:{{port}}/", new Processor() {
+ Exchange exchange = template.request("netty-http:http://localhost:{{port}}/", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.POST);
}
@@ -69,7 +69,7 @@ public class NettyHttpBindingUseRelativePathTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/mypath").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}/mypath").process(new Processor() {
public void process(Exchange exchange) throws Exception {
assertEquals("Get a wrong form parameter from the message header", "localhost:" + getPort(), exchange.getIn().getHeader("host"));
@@ -84,7 +84,7 @@ public class NettyHttpBindingUseRelativePathTest extends BaseNettyTest {
}
});
- from("netty4-http:http://localhost:{{port}}").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}").process(new Processor() {
public void process(Exchange exchange) throws Exception {
assertEquals("Get a wrong form parameter from the message header", "localhost:" + getPort(), exchange.getIn().getHeader("host"));
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
similarity index 85%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
index 3c66fd0..a1470a1 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
@@ -79,17 +79,17 @@ public class NettyHttpBridgeEncodedPathTest extends BaseNettyTest {
exchange.getOut().setBody(exchange.getIn().getHeader(Exchange.HTTP_QUERY));
}
};
- from("netty4-http:http://localhost:" + port2 + "/nettyTestRouteA?matchOnUriPrefix=true")
+ from("netty-http:http://localhost:" + port2 + "/nettyTestRouteA?matchOnUriPrefix=true")
.log("Using NettyTestRouteA route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
- .to("netty4-http:http://localhost:" + port1 + "/nettyTestRouteB?throwExceptionOnFailure=false&bridgeEndpoint=true");
- from("netty4-http:http://localhost:" + port1 + "/nettyTestRouteB?matchOnUriPrefix=true")
+ .to("netty-http:http://localhost:" + port1 + "/nettyTestRouteB?throwExceptionOnFailure=false&bridgeEndpoint=true");
+ from("netty-http:http://localhost:" + port1 + "/nettyTestRouteB?matchOnUriPrefix=true")
.log("Using NettyTestRouteB route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
.process(serviceProc);
- from("netty4-http:http://localhost:" + port4 + "/nettyTestRouteC?matchOnUriPrefix=true")
+ from("netty-http:http://localhost:" + port4 + "/nettyTestRouteC?matchOnUriPrefix=true")
.log("Using NettyTestRouteC route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
- .to("netty4-http:http://localhost:" + port3 + "/nettyTestRouteD?throwExceptionOnFailure=false&bridgeEndpoint=true");
- from("netty4-http:http://localhost:" + port3 + "/nettyTestRouteD?matchOnUriPrefix=true")
+ .to("netty-http:http://localhost:" + port3 + "/nettyTestRouteD?throwExceptionOnFailure=false&bridgeEndpoint=true");
+ from("netty-http:http://localhost:" + port3 + "/nettyTestRouteD?matchOnUriPrefix=true")
.log("Using NettyTestRouteD route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
.to("mock:encodedPath");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeRouteUsingHttpClientTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeRouteUsingHttpClientTest.java
similarity index 93%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeRouteUsingHttpClientTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeRouteUsingHttpClientTest.java
index 5311965..5372bb6 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeRouteUsingHttpClientTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeRouteUsingHttpClientTest.java
@@ -69,13 +69,13 @@ public class NettyHttpBridgeRouteUsingHttpClientTest extends BaseNettyTest {
exchange.getOut().setBody(uri);
}
};
- from("netty4-http:http://localhost:" + port2 + "/test/hello")
+ from("netty-http:http://localhost:" + port2 + "/test/hello")
.to("http://localhost:" + port1 + "?throwExceptionOnFailure=false&bridgeEndpoint=true");
- from("netty4-http:http://localhost:" + port1 + "?matchOnUriPrefix=true").process(serviceProc);
+ from("netty-http:http://localhost:" + port1 + "?matchOnUriPrefix=true").process(serviceProc);
// check the from request
- from("netty4-http:http://localhost:" + port2 + "/form?bridgeEndpoint=true")
+ from("netty-http:http://localhost:" + port2 + "/form?bridgeEndpoint=true")
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCharacterEncodingTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCharacterEncodingTest.java
similarity index 91%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCharacterEncodingTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCharacterEncodingTest.java
index 2066db8..e8e1b00 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCharacterEncodingTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCharacterEncodingTest.java
@@ -25,7 +25,7 @@ public class NettyHttpCharacterEncodingTest extends BaseNettyTest {
@Test
public void testSendToNetty() throws Exception {
- Exchange exchange = template.request("netty4-http:http://localhost:{{port}}/myapp/myservice", new Processor() {
+ Exchange exchange = template.request("netty-http:http://localhost:{{port}}/myapp/myservice", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("Hello World Thai Elephant \u0E08");
@@ -42,7 +42,7 @@ public class NettyHttpCharacterEncodingTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/myapp/myservice").process(new MyBookService());
+ from("netty-http:http://localhost:{{port}}/myapp/myservice").process(new MyBookService());
}
};
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientChunkedTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientChunkedTest.java
similarity index 89%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientChunkedTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientChunkedTest.java
index 79e9d4a..1f58733 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientChunkedTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientChunkedTest.java
@@ -25,7 +25,7 @@ public class NettyHttpClientChunkedTest extends BaseNettyTest {
public void testHttpSimple() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -36,7 +36,7 @@ public class NettyHttpClientChunkedTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientExpectContinueTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientExpectContinueTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientExpectContinueTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientExpectContinueTest.java
index 6883771..bbfa944 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientExpectContinueTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientExpectContinueTest.java
@@ -35,7 +35,7 @@ public class NettyHttpClientExpectContinueTest extends BaseNettyTest {
exchange.getIn().setHeader("Expect", "100-continue");
exchange.getIn().setBody(body);
- Exchange result = template.send("netty4-http:http://localhost:{{port}}/foo", exchange);
+ Exchange result = template.send("netty-http:http://localhost:{{port}}/foo", exchange);
assertFalse(result.isFailed());
assertEquals("Bye World", result.getIn().getBody(String.class));
@@ -48,7 +48,7 @@ public class NettyHttpClientExpectContinueTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCompressTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCompressTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCompressTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCompressTest.java
index 6314aee..b1469f4 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCompressTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCompressTest.java
@@ -47,7 +47,7 @@ public class NettyHttpCompressTest extends BaseNettyTest {
Map<String, Object> headers = new HashMap<>();
headers.put("content-type", "text/plain; charset=\"UTF-8\"");
headers.put("Accept-Encoding", "compress, gzip");
- String out = template.requestBodyAndHeaders("netty4-http:http://localhost:{{port}}/foo?decoders=#myDecoders", data,
+ String out = template.requestBodyAndHeaders("netty-http:http://localhost:{{port}}/foo?decoders=#myDecoders", data,
headers, String.class);
// The decoded out has some space to clean up.
assertEquals("Bye World", out.trim());
@@ -61,7 +61,7 @@ public class NettyHttpCompressTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo?compression=true")
+ from("netty-http:http://0.0.0.0:{{port}}/foo?compression=true")
.transform().constant("Bye World").setHeader("content-type").constant("text/plain; charset=\"UTF-8\"");
}
};
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpContentTypeTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpContentTypeTest.java
similarity index 91%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpContentTypeTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpContentTypeTest.java
index d2dcae8..66c61fe 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpContentTypeTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpContentTypeTest.java
@@ -33,7 +33,7 @@ public class NettyHttpContentTypeTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedPropertyReceived(Exchange.CHARSET_NAME, "iso-8859-1");
byte[] data = "Hello World".getBytes(Charset.forName("iso-8859-1"));
- String out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", data,
+ String out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", data,
"content-type", "text/plain; charset=\"iso-8859-1\"", String.class);
assertEquals("Bye World", out);
@@ -49,7 +49,7 @@ public class NettyHttpContentTypeTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedPropertyReceived(Exchange.CHARSET_NAME, "iso-8859-1");
byte[] data = "Hello World".getBytes(Charset.forName("iso-8859-1"));
- String out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", data,
+ String out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", data,
"content-type", "text/plain;charset=\"iso-8859-1\";action=\"http://somewhere.com/foo\"", String.class);
assertEquals("Bye World", out);
@@ -65,7 +65,7 @@ public class NettyHttpContentTypeTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedPropertyReceived(Exchange.CHARSET_NAME, "utf-8");
byte[] data = "Hello World".getBytes(Charset.forName("utf-8"));
- String out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", data,
+ String out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", data,
"content-type", "application/soap+xml;charset=\"utf-8\";action=\"http://somewhere.com/foo\"", String.class);
assertEquals("Bye World", out);
@@ -77,7 +77,7 @@ public class NettyHttpContentTypeTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/foo")
+ from("netty-http:http://localhost:{{port}}/foo")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpConvertPayloadToInputStreamTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpConvertPayloadToInputStreamTest.java
similarity index 91%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpConvertPayloadToInputStreamTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpConvertPayloadToInputStreamTest.java
index 7c1b969..690cc06 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpConvertPayloadToInputStreamTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpConvertPayloadToInputStreamTest.java
@@ -34,7 +34,7 @@ public class NettyHttpConvertPayloadToInputStreamTest extends BaseNettyTest {
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(1);
- template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/test", expectedBody, "Content-Type", "application/xml");
+ template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/test", expectedBody, "Content-Type", "application/xml");
mockEndpoint.assertIsSatisfied();
List<Exchange> list = mockEndpoint.getReceivedExchanges();
@@ -53,7 +53,7 @@ public class NettyHttpConvertPayloadToInputStreamTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("netty4-http:http://localhost:{{port}}/test").
+ from("netty-http:http://localhost:{{port}}/test").
convertBodyTo(InputStream.class).
to("mock:result");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCustomOptionsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCustomOptionsTest.java
similarity index 84%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCustomOptionsTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCustomOptionsTest.java
index d39e6a7..547c35b 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCustomOptionsTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCustomOptionsTest.java
@@ -27,7 +27,7 @@ public class NettyHttpCustomOptionsTest extends BaseNettyTest {
@Test
public void shouldReturnCustomResponseForOptions() throws Exception {
- String response = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", "", HTTP_METHOD, "OPTIONS", String.class);
+ String response = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", "", HTTP_METHOD, "OPTIONS", String.class);
assertEquals(expectedResponse, response);
}
@@ -36,7 +36,7 @@ public class NettyHttpCustomOptionsTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo?httpMethodRestrict=OPTIONS").setBody().constant(expectedResponse);
+ from("netty-http:http://0.0.0.0:{{port}}/foo?httpMethodRestrict=OPTIONS").setBody().constant(expectedResponse);
}
};
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEmptyQueryParameterTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEmptyQueryParameterTest.java
similarity index 85%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEmptyQueryParameterTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEmptyQueryParameterTest.java
index 9a4c2b3..10b103a 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEmptyQueryParameterTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEmptyQueryParameterTest.java
@@ -24,14 +24,14 @@ public class NettyHttpEmptyQueryParameterTest extends BaseNettyTest {
@Test
public void testEmpty() throws Exception {
getMockEndpoint("mock:input").expectedHeaderReceived("id", 123);
- String out = fluentTemplate.to("netty4-http:http://localhost:{{port}}/foo?id=123").request(String.class);
+ String out = fluentTemplate.to("netty-http:http://localhost:{{port}}/foo?id=123").request(String.class);
assertEquals("Header: 123", out);
assertMockEndpointsSatisfied();
resetMocks();
getMockEndpoint("mock:input").expectedHeaderReceived("id", "");
- out = fluentTemplate.to("netty4-http:http://localhost:{{port}}/foo?id=").request(String.class);
+ out = fluentTemplate.to("netty-http:http://localhost:{{port}}/foo?id=").request(String.class);
assertEquals("Header: ", out);
assertMockEndpointsSatisfied();
}
@@ -41,7 +41,7 @@ public class NettyHttpEmptyQueryParameterTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.transform().simple("Header: ${header.id}");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java
similarity index 89%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java
index ef7bff6..77dce00 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java
@@ -48,9 +48,9 @@ public class NettyHttpEndpointUriCustomHeaderFilterStrategyTest extends BaseNett
@Override
public void configure() throws Exception {
from("direct:request").setHeader("Date", constant("31-03-2014"))
- .to("netty4-http:http://localhost:{{port}}/myapp/mytest?headerFilterStrategy=#customHeaderFilterStrategy");
+ .to("netty-http:http://localhost:{{port}}/myapp/mytest?headerFilterStrategy=#customHeaderFilterStrategy");
- from("netty4-http:http://localhost:{{port}}/myapp/mytest").to("mock:outbound").setHeader("sub-date", constant("31-05-2014"));
+ from("netty-http:http://localhost:{{port}}/myapp/mytest").to("mock:outbound").setHeader("sub-date", constant("31-05-2014"));
}
};
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueTest.java
similarity index 85%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueTest.java
index 438780b..0f39551 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueTest.java
@@ -25,7 +25,7 @@ public class NettyHttpEndpointUriEncodingIssueTest extends BaseNettyTest {
@Test
public void testEndpointUriEncodingIssue() throws Exception {
- String uri = "netty4-http:http://localhost:{{port}}/myapp/mytest?columns=totalsens,upsens&username=apiuser";
+ String uri = "netty-http:http://localhost:{{port}}/myapp/mytest?columns=totalsens,upsens&username=apiuser";
String out = template.requestBody(uri, null, String.class);
assertEquals("We got totalsens,upsens columns", out);
@@ -33,7 +33,7 @@ public class NettyHttpEndpointUriEncodingIssueTest extends BaseNettyTest {
@Test
public void testEndpointUriWithDanishCharEncodingIssue() throws Exception {
- String uri = "netty4-http:http://localhost:{{port}}/myapp/mytest?columns=claus,s\u00F8ren&username=apiuser";
+ String uri = "netty-http:http://localhost:{{port}}/myapp/mytest?columns=claus,s\u00F8ren&username=apiuser";
String out = template.requestBody(uri, null, String.class);
assertEquals("We got claus,s\u00F8ren columns", out);
@@ -44,7 +44,7 @@ public class NettyHttpEndpointUriEncodingIssueTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/myapp/mytest?urlDecodeHeaders=true").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}/myapp/mytest?urlDecodeHeaders=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String columns = exchange.getIn().getHeader("columns", String.class);
exchange.getOut().setBody("We got " + columns + " columns");
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java
similarity index 88%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java
index 171a982..608143a 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java
@@ -25,7 +25,7 @@ public class NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest extends Base
@Test
public void testEndpointUriWithDanishCharEncodingIssue() throws Exception {
- String uri = "netty4-http:http://localhost:{{port}}/myapp/mytest?columns=claus,s\u00F8ren&username=apiuser";
+ String uri = "netty-http:http://localhost:{{port}}/myapp/mytest?columns=claus,s\u00F8ren&username=apiuser";
String out = template.requestBody(uri, null, String.class);
assertEquals("We got claus%2Cs%C3%B8ren columns", out);
@@ -36,7 +36,7 @@ public class NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest extends Base
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/myapp/mytest?urlDecodeHeaders=false").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}/myapp/mytest?urlDecodeHeaders=false").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String columns = exchange.getIn().getHeader("columns", String.class);
exchange.getOut().setBody("We got " + columns + " columns");
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java
index eea4736..6954064 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java
@@ -31,7 +31,7 @@ public class NettyHttpFilterCamelHeadersTest extends BaseNettyTest {
@Test
public void testFilterCamelHeaders() throws Exception {
- Exchange out = template.request("netty4-http:http://localhost:{{port}}/test/filter", new Processor() {
+ Exchange out = template.request("netty-http:http://localhost:{{port}}/test/filter", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("Claus");
exchange.getIn().setHeader("bar", 123);
@@ -57,7 +57,7 @@ public class NettyHttpFilterCamelHeadersTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/test/filter").bean("foo");
+ from("netty-http:http://localhost:{{port}}/test/filter").bean("foo");
}
};
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
similarity index 98%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
index 08b4491..8e5c307 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
@@ -95,7 +95,7 @@ public class NettyHttpGetWithInvalidMessageTest extends CamelTestSupport {
port1 = AvailablePortFinder.getNextAvailable(8100);
// set up a netty http proxy
- from("netty4-http:http://localhost:" + port1 + "/test")
+ from("netty-http:http://localhost:" + port1 + "/test")
.transform().simple("Bye ${header.user}.");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamAsExchangeHeaderTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamAsExchangeHeaderTest.java
similarity index 97%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamAsExchangeHeaderTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamAsExchangeHeaderTest.java
index bfc355c..aff3e5f 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamAsExchangeHeaderTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamAsExchangeHeaderTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
public class NettyHttpGetWithParamAsExchangeHeaderTest extends BaseNettyTest {
- private String serverUri = "netty4-http:http://localhost:" + getPort() + "/myservice?urlDecodeHeaders=true";
+ private String serverUri = "netty-http:http://localhost:" + getPort() + "/myservice?urlDecodeHeaders=true";
@Test
public void testHttpGetWithParamsViaURI() throws Exception {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamTest.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamTest.java
index a9362f0..a2a9de8 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
public class NettyHttpGetWithParamTest extends BaseNettyTest {
- private String serverUri = "netty4-http:http://localhost:" + getPort() + "/myservice";
+ private String serverUri = "netty-http:http://localhost:" + getPort() + "/myservice";
private MyParamsProcessor processor = new MyParamsProcessor();
@Test
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java
index 1760bb3..6bf6c7a 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java
@@ -26,7 +26,7 @@ import org.junit.Test;
public class NettyHttpHandle404Test extends BaseNettyTest {
public String getProducerUrl() {
- return "netty4-http:http://localhost:{{port}}/myserver?user=Camel";
+ return "netty-http:http://localhost:{{port}}/myserver?user=Camel";
}
@Test
@@ -76,7 +76,7 @@ public class NettyHttpHandle404Test extends BaseNettyTest {
// this is our jetty server where we simulate the 404
- from("netty4-http:http://localhost:{{port}}/myserver")
+ from("netty-http:http://localhost:{{port}}/myserver")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody("Page not found");
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderCaseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderCaseTest.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderCaseTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderCaseTest.java
index 4faf262..83fed6f 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderCaseTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderCaseTest.java
@@ -49,7 +49,7 @@ public class NettyHttpHeaderCaseTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/myapp/mytest").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}/myapp/mytest").process(new Processor() {
public void process(Exchange exchange) throws Exception {
// headers received should be in case as well
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyRemovalTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyRemovalTest.java
similarity index 88%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyRemovalTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyRemovalTest.java
index f9ea005..d735f89 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyRemovalTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyRemovalTest.java
@@ -40,7 +40,7 @@ public class NettyHttpHeaderFilterStrategyRemovalTest extends BaseNettyTest {
mockEndpoint.expectedMessageCount(1);
mockEndpoint.message(0).header(HTTP_QUERY).isNull();
- template.sendBody("netty4-http:http://localhost:" + getPort() + "/?" + options, "message");
+ template.sendBody("netty-http:http://localhost:" + getPort() + "/?" + options, "message");
assertMockEndpointsSatisfied();
}
@@ -53,7 +53,7 @@ public class NettyHttpHeaderFilterStrategyRemovalTest extends BaseNettyTest {
mockEndpoint.expectedMessageCount(1);
mockEndpoint.message(0).header(headerToFilter).isNull();
- template.sendBodyAndHeader("netty4-http:http://localhost:" + getPort() + "/?" + options, "message", headerToFilter, "headerValue");
+ template.sendBodyAndHeader("netty-http:http://localhost:" + getPort() + "/?" + options, "message", headerToFilter, "headerValue");
assertMockEndpointsSatisfied();
}
@@ -63,7 +63,7 @@ public class NettyHttpHeaderFilterStrategyRemovalTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/").to(mockEndpoint);
+ from("netty-http:http://0.0.0.0:{{port}}/").to(mockEndpoint);
}
};
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyTest.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyTest.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderMaxSizeTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderMaxSizeTest.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderMaxSizeTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderMaxSizeTest.java
index 7fc9407..a65e0e5 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderMaxSizeTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderMaxSizeTest.java
@@ -53,7 +53,7 @@ public class NettyHttpHeaderMaxSizeTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/myapp/mytest?maxHeaderSize=100")
+ from("netty-http:http://localhost:{{port}}/myapp/mytest?maxHeaderSize=100")
.transform().constant("Bye World");
}
};
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeadersTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeadersTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeadersTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeadersTest.java
index 5347fb5..e000dc4 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeadersTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeadersTest.java
@@ -33,7 +33,7 @@ public class NettyHttpHeadersTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_QUERY, "beer=yes");
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_PATH, "");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo?beer=yes", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo?beer=yes", "Hello World", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -44,7 +44,7 @@ public class NettyHttpHeadersTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/foo")
+ from("netty-http:http://localhost:{{port}}/foo")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMapHeadersFalseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMapHeadersFalseTest.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMapHeadersFalseTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMapHeadersFalseTest.java
index d49cd92..029048b 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMapHeadersFalseTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMapHeadersFalseTest.java
@@ -46,7 +46,7 @@ public class NettyHttpMapHeadersFalseTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/myapp/mytest?mapHeaders=false").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}/myapp/mytest?mapHeaders=false").process(new Processor() {
public void process(Exchange exchange) throws Exception {
// these headers is not mapped
assertNull(exchange.getIn().getHeader("clientHeader"));
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMethodRestrictTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMethodRestrictTest.java
similarity index 95%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMethodRestrictTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMethodRestrictTest.java
index 5e83319..7c6fb56 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMethodRestrictTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMethodRestrictTest.java
@@ -61,7 +61,7 @@ public class NettyHttpMethodRestrictTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/methodRestrict?httpMethodRestrict=POST").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}/methodRestrict?httpMethodRestrict=POST").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message in = exchange.getIn();
String request = in.getBody(String.class);
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java
similarity index 82%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java
index adf5661..c2109b2 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java
@@ -27,7 +27,7 @@ public class NettyHttpOkStatusCodeTest extends BaseNettyTest {
public void testNoOk() throws Exception {
byte[] data = "Hello World".getBytes();
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/test?okStatusCodeRange=200-200", data, String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/test?okStatusCodeRange=200-200", data, String.class);
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -42,7 +42,7 @@ public class NettyHttpOkStatusCodeTest extends BaseNettyTest {
public void testNoOkComplexRange() throws Exception {
byte[] data = "Hello World".getBytes();
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/test?okStatusCodeRange=200-204,301", data, String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/test?okStatusCodeRange=200-204,301", data, String.class);
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -55,7 +55,7 @@ public class NettyHttpOkStatusCodeTest extends BaseNettyTest {
@Test
public void testOk() throws Exception {
byte[] data = "Hello World".getBytes();
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/test?okStatusCodeRange=200-209", data, String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/test?okStatusCodeRange=200-209", data, String.class);
assertEquals("Not allowed", out);
}
@@ -63,7 +63,7 @@ public class NettyHttpOkStatusCodeTest extends BaseNettyTest {
@Test
public void testOkComplexRange() throws Exception {
byte[] data = "Hello World".getBytes();
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/test?okStatusCodeRange=200-204,209,301-304", data, String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/test?okStatusCodeRange=200-204,209,301-304", data, String.class);
assertEquals("Not allowed", out);
}
@@ -72,7 +72,7 @@ public class NettyHttpOkStatusCodeTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/test")
+ from("netty-http:http://0.0.0.0:{{port}}/test")
.setHeader(Exchange.HTTP_RESPONSE_CODE, constant(209))
.transform().constant("Not allowed");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOnExceptionHandledTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOnExceptionHandledTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOnExceptionHandledTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOnExceptionHandledTest.java
index d8e77e6..bc0bb92 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOnExceptionHandledTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOnExceptionHandledTest.java
@@ -24,7 +24,7 @@ public class NettyHttpOnExceptionHandledTest extends BaseNettyTest {
@Test
public void testOnExceptionHandled() throws Exception {
- Exchange reply = template.request("netty4-http:http://localhost:{{port}}/myserver?throwExceptionOnFailure=false", null);
+ Exchange reply = template.request("netty-http:http://localhost:{{port}}/myserver?throwExceptionOnFailure=false", null);
assertNotNull(reply);
assertEquals("Dude something went wrong", reply.getOut().getBody(String.class));
@@ -37,7 +37,7 @@ public class NettyHttpOnExceptionHandledTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
// START SNIPPET: e1
- from("netty4-http:http://localhost:{{port}}/myserver")
+ from("netty-http:http://localhost:{{port}}/myserver")
// use onException to catch all exceptions and return a custom reply message
.onException(Exception.class)
.handled(true)
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedExceptionTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedExceptionTest.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedExceptionTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedExceptionTest.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerBridgeTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerBridgeTest.java
similarity index 81%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerBridgeTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerBridgeTest.java
index cb54a2b..f0eca71 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerBridgeTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerBridgeTest.java
@@ -30,7 +30,7 @@ public class NettyHttpProducerBridgeTest extends BaseNettyTest {
@Test
public void testProxy() throws Exception {
- String reply = template.requestBody("netty4-http:http://localhost:" + port1 + "/foo", "World", String.class);
+ String reply = template.requestBody("netty-http:http://localhost:" + port1 + "/foo", "World", String.class);
assertEquals("Bye World", reply);
}
@@ -40,7 +40,7 @@ public class NettyHttpProducerBridgeTest extends BaseNettyTest {
mock.message(0).header(Exchange.HTTP_RAW_QUERY).isEqualTo("x=%3B");
mock.message(0).header(Exchange.HTTP_QUERY).isEqualTo("x=;");
- template.request("netty4-http:http://localhost:" + port3 + "/query?bridgeEndpoint=true", new Processor() {
+ template.request("netty-http:http://localhost:" + port3 + "/query?bridgeEndpoint=true", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(Exchange.HTTP_URI, "http://host:8080/");
@@ -56,7 +56,7 @@ public class NettyHttpProducerBridgeTest extends BaseNettyTest {
mock.message(0).header(Exchange.HTTP_RAW_QUERY).isEqualTo("x=%3B");
mock.message(0).header(Exchange.HTTP_QUERY).isEqualTo("x=;");
- template.request("netty4-http:http://localhost:" + port3 + "/query?bridgeEndpoint=true", new Processor() {
+ template.request("netty-http:http://localhost:" + port3 + "/query?bridgeEndpoint=true", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(Exchange.HTTP_URI, "http://host:8080/");
@@ -76,13 +76,13 @@ public class NettyHttpProducerBridgeTest extends BaseNettyTest {
port2 = getNextPort();
port3 = getNextPort();
- from("netty4-http:http://0.0.0.0:" + port1 + "/foo")
- .to("netty4-http:http://localhost:" + port2 + "/bar?bridgeEndpoint=true&throwExceptionOnFailure=false");
+ from("netty-http:http://0.0.0.0:" + port1 + "/foo")
+ .to("netty-http:http://localhost:" + port2 + "/bar?bridgeEndpoint=true&throwExceptionOnFailure=false");
- from("netty4-http:http://0.0.0.0:" + port2 + "/bar")
+ from("netty-http:http://0.0.0.0:" + port2 + "/bar")
.transform().simple("Bye ${body}");
- from("netty4-http:http://0.0.0.0:" + port3 + "/query")
+ from("netty-http:http://0.0.0.0:" + port3 + "/query")
.to("mock:query");
}
};
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerConcurrentTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerConcurrentTest.java
similarity index 94%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerConcurrentTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerConcurrentTest.java
index fb829e7..ade2120 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerConcurrentTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerConcurrentTest.java
@@ -54,7 +54,7 @@ public class NettyHttpProducerConcurrentTest extends BaseNettyTest {
final int index = i;
Future<String> out = executor.submit(new Callable<String>() {
public String call() throws Exception {
- return template.requestBody("netty4-http:http://localhost:{{port}}/echo", "" + index, String.class);
+ return template.requestBody("netty-http:http://localhost:{{port}}/echo", "" + index, String.class);
}
});
responses.put(index, out);
@@ -81,7 +81,7 @@ public class NettyHttpProducerConcurrentTest extends BaseNettyTest {
return new RouteBuilder() {
public void configure() throws Exception {
// expose a echo service
- from("netty4-http:http://localhost:{{port}}/echo")
+ from("netty-http:http://localhost:{{port}}/echo")
.transform(body().append(body())).to("mock:result");
}
};
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerKeepAliveTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerKeepAliveTest.java
similarity index 75%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerKeepAliveTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerKeepAliveTest.java
index 8e4c40e..13b5aef 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerKeepAliveTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerKeepAliveTest.java
@@ -29,10 +29,10 @@ public class NettyHttpProducerKeepAliveTest extends BaseNettyTest {
public void testHttpKeepAlive() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World", "Hello Again");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo?keepAlive=true", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo?keepAlive=true", "Hello World", String.class);
assertEquals("Bye World", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/foo?keepAlive=true", "Hello Again", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/foo?keepAlive=true", "Hello Again", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -42,10 +42,10 @@ public class NettyHttpProducerKeepAliveTest extends BaseNettyTest {
public void testHttpKeepAliveFalse() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World", "Hello Again");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo?keepAlive=false", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo?keepAlive=false", "Hello World", String.class);
assertEquals("Bye World", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/foo?keepAlive=false", "Hello Again", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/foo?keepAlive=false", "Hello Again", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -54,7 +54,7 @@ public class NettyHttpProducerKeepAliveTest extends BaseNettyTest {
@Test
public void testConnectionClosed() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- Exchange ex = template.request("netty4-http:http://localhost:{{port}}/bar?keepAlive=false", new Processor() {
+ Exchange ex = template.request("netty-http:http://localhost:{{port}}/bar?keepAlive=false", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("Hello World");
@@ -71,11 +71,11 @@ public class NettyHttpProducerKeepAliveTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/foo")
+ from("netty-http:http://localhost:{{port}}/foo")
.to("mock:input")
.transform().constant("Bye World");
- from("netty4-http:http://localhost:{{port}}/bar").removeHeaders("*").to("mock:input").transform().constant("Bye World");
+ from("netty-http:http://localhost:{{port}}/bar").removeHeaders("*").to("mock:input").transform().constant("Bye World");
}
};
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerQueryParamTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerQueryParamTest.java
similarity index 97%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerQueryParamTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerQueryParamTest.java
index d29c660..765c8e5 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerQueryParamTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerQueryParamTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
public class NettyHttpProducerQueryParamTest extends BaseNettyTest {
- private String url = "netty4-http:http://localhost:" + getPort() + "/cheese?urlDecodeHeaders=true";
+ private String url = "netty-http:http://localhost:" + getPort() + "/cheese?urlDecodeHeaders=true";
@Test
public void testQueryParameters() throws Exception {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSendEmptyHeaderTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSendEmptyHeaderTest.java
similarity index 89%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSendEmptyHeaderTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSendEmptyHeaderTest.java
index c051a34..06a5843 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSendEmptyHeaderTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSendEmptyHeaderTest.java
@@ -28,7 +28,7 @@ public class NettyHttpProducerSendEmptyHeaderTest extends BaseNettyTest {
mock.expectedMessageCount(1);
mock.expectedHeaderReceived("foo", "");
- template.sendBodyAndHeader("netty4-http:http://localhost:{{port}}/myapp/mytest", "Hello World", "foo", "");
+ template.sendBodyAndHeader("netty-http:http://localhost:{{port}}/myapp/mytest", "Hello World", "foo", "");
assertMockEndpointsSatisfied();
}
@@ -38,7 +38,7 @@ public class NettyHttpProducerSendEmptyHeaderTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/myapp/mytest")
+ from("netty-http:http://localhost:{{port}}/myapp/mytest")
.convertBodyTo(String.class)
.to("mock:result");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSessionTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSessionTest.java
similarity index 83%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSessionTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSessionTest.java
index b504bb7..19a7df0 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSessionTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSessionTest.java
@@ -64,13 +64,13 @@ public class NettyHttpProducerSessionTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:start").toF("netty4-http:http://127.0.0.1:%d/session", getPort()).toF("netty4-http:http://127.0.0.1:%d/session", getPort()).to("mock:result");
+ from("direct:start").toF("netty-http:http://127.0.0.1:%d/session", getPort()).toF("netty-http:http://127.0.0.1:%d/session", getPort()).to("mock:result");
- from("direct:instance").toF("netty4-http:http://127.0.0.1:%d/session?cookieHandler=#instanceCookieHandler", getPort())
- .toF("netty4-http:http://127.0.0.1:%d/session?cookieHandler=#instanceCookieHandler", getPort()).to("mock:result");
+ from("direct:instance").toF("netty-http:http://127.0.0.1:%d/session?cookieHandler=#instanceCookieHandler", getPort())
+ .toF("netty-http:http://127.0.0.1:%d/session?cookieHandler=#instanceCookieHandler", getPort()).to("mock:result");
- from("direct:exchange").toF("netty4-http:http://127.0.0.1:%d/session?cookieHandler=#exchangeCookieHandler", getPort())
- .toF("netty4-http:http://127.0.0.1:%d/session?cookieHandler=#exchangeCookieHandler", getPort()).to("mock:result");
+ from("direct:exchange").toF("netty-http:http://127.0.0.1:%d/session?cookieHandler=#exchangeCookieHandler", getPort())
+ .toF("netty-http:http://127.0.0.1:%d/session?cookieHandler=#exchangeCookieHandler", getPort()).to("mock:result");
fromF("jetty:http://127.0.0.1:%d/session?sessionSupport=true", getPort()).process(new Processor() {
@Override
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleGetTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleGetTest.java
similarity index 79%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleGetTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleGetTest.java
index 2c1ae75..fb08f29 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleGetTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleGetTest.java
@@ -26,12 +26,12 @@ public class NettyHttpProducerSimpleGetTest extends BaseNettyTest {
public void testHttpSimple() throws Exception {
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_METHOD, "GET");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", null, String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", null, String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
- out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", null, String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/foo", null, String.class);
assertEquals("Bye World", out);
}
@@ -39,7 +39,7 @@ public class NettyHttpProducerSimpleGetTest extends BaseNettyTest {
public void testHttpSimpleHeader() throws Exception {
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_METHOD, "GET");
- String out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", null, Exchange.HTTP_METHOD, "GET", String.class);
+ String out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", null, Exchange.HTTP_METHOD, "GET", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -51,7 +51,7 @@ public class NettyHttpProducerSimpleGetTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_METHOD, "GET");
- String out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", "Hello World", Exchange.HTTP_METHOD, "GET", String.class);
+ String out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", "Hello World", Exchange.HTTP_METHOD, "GET", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -62,7 +62,7 @@ public class NettyHttpProducerSimpleGetTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleTest.java
similarity index 89%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleTest.java
index e119641..a890153 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleTest.java
@@ -28,7 +28,7 @@ public class NettyHttpProducerSimpleTest extends BaseNettyTest {
public void testHttpSimple() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -38,7 +38,7 @@ public class NettyHttpProducerSimpleTest extends BaseNettyTest {
public void testHttpSimpleExchange() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- Exchange out = template.request("netty4-http:http://localhost:{{port}}/foo", new Processor() {
+ Exchange out = template.request("netty-http:http://localhost:{{port}}/foo", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("Hello World");
@@ -64,7 +64,7 @@ public class NettyHttpProducerSimpleTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/foo")
+ from("netty-http:http://localhost:{{port}}/foo")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerThrowExceptionOnFailureTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerThrowExceptionOnFailureTest.java
similarity index 85%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerThrowExceptionOnFailureTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerThrowExceptionOnFailureTest.java
index b40eddb..dee9a17 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerThrowExceptionOnFailureTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerThrowExceptionOnFailureTest.java
@@ -25,7 +25,7 @@ public class NettyHttpProducerThrowExceptionOnFailureTest extends BaseNettyTest
@Test
public void testFailWithoutException() throws Exception {
try {
- String out = template().requestBody("netty4-http:http://localhost:{{port}}/fail?throwExceptionOnFailure=false", null, String.class);
+ String out = template().requestBody("netty-http:http://localhost:{{port}}/fail?throwExceptionOnFailure=false", null, String.class);
assertEquals("Fail", out);
} catch (Throwable t) {
t.printStackTrace();
@@ -36,7 +36,7 @@ public class NettyHttpProducerThrowExceptionOnFailureTest extends BaseNettyTest
@Test
public void testFailWithException() throws Exception {
try {
- template().requestBody("netty4-http:http://localhost:{{port}}/fail?throwExceptionOnFailure=true", null, String.class);
+ template().requestBody("netty-http:http://localhost:{{port}}/fail?throwExceptionOnFailure=true", null, String.class);
fail("Should throw an exception");
} catch (Throwable t) {
NettyHttpOperationFailedException cause = (NettyHttpOperationFailedException) t.getCause();
@@ -49,7 +49,7 @@ public class NettyHttpProducerThrowExceptionOnFailureTest extends BaseNettyTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/fail")
+ from("netty-http:http://localhost:{{port}}/fail")
.setHeader(Exchange.HTTP_RESPONSE_CODE).constant(404)
.transform(constant("Fail"));
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerTwoParametersWithSameKeyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerTwoParametersWithSameKeyTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerTwoParametersWithSameKeyTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerTwoParametersWithSameKeyTest.java
index 75aadcc..ca06783 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerTwoParametersWithSameKeyTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerTwoParametersWithSameKeyTest.java
@@ -28,7 +28,7 @@ public class NettyHttpProducerTwoParametersWithSameKeyTest extends BaseNettyTest
@Test
public void testTwoParametersWithSameKey() throws Exception {
- Exchange out = template.request("netty4-http:http://localhost:{{port}}/myapp?from=me&to=foo&to=bar", null);
+ Exchange out = template.request("netty-http:http://localhost:{{port}}/myapp?from=me&to=foo&to=bar", null);
assertNotNull(out);
assertFalse("Should not fail", out.isFailed());
@@ -44,7 +44,7 @@ public class NettyHttpProducerTwoParametersWithSameKeyTest extends BaseNettyTest
@Test
public void testTwoHeadersWithSameKeyHeader() throws Exception {
- Exchange out = template.request("netty4-http:http://localhost:{{port}}/myapp", new Processor() {
+ Exchange out = template.request("netty-http:http://localhost:{{port}}/myapp", new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody(null);
exchange.getIn().setHeader("from", "me");
@@ -72,7 +72,7 @@ public class NettyHttpProducerTwoParametersWithSameKeyTest extends BaseNettyTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/myapp").process(new Processor() {
+ from("netty-http:http://localhost:{{port}}/myapp").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String from = exchange.getIn().getHeader("from", String.class);
assertEquals("me", from);
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerWithHeaderTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerWithHeaderTest.java
similarity index 84%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerWithHeaderTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerWithHeaderTest.java
index 93d3af5..fe6064b 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerWithHeaderTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerWithHeaderTest.java
@@ -27,7 +27,7 @@ public class NettyHttpProducerWithHeaderTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_METHOD, "GET");
getMockEndpoint("mock:input").expectedHeaderReceived("myTraceId", "mockCorrelationID");
- String out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", null, "myTraceId", "mockCorrelationID", String.class);
+ String out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", null, "myTraceId", "mockCorrelationID", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -39,7 +39,7 @@ public class NettyHttpProducerWithHeaderTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedHeaderReceived("myTraceId", "mockCorrelationID");
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- String out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", "Hello World", "myTraceId", "mockCorrelationID", String.class);
+ String out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", "Hello World", "myTraceId", "mockCorrelationID", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -50,7 +50,7 @@ public class NettyHttpProducerWithHeaderTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProtocolNoSlashTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProtocolNoSlashTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProtocolNoSlashTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProtocolNoSlashTest.java
index 7d14c11..e632bc6 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProtocolNoSlashTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProtocolNoSlashTest.java
@@ -33,7 +33,7 @@ public class NettyHttpProtocolNoSlashTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_QUERY, "beer=yes");
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_PATH, "");
- String out = template.requestBody("netty4-http:http:localhost:{{port}}/foo?beer=yes", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http:localhost:{{port}}/foo?beer=yes", "Hello World", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -44,7 +44,7 @@ public class NettyHttpProtocolNoSlashTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http:localhost:{{port}}/foo")
+ from("netty-http:http:localhost:{{port}}/foo")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRawQueryTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRawQueryTest.java
similarity index 97%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRawQueryTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRawQueryTest.java
index a51d022..ab52c4a 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRawQueryTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRawQueryTest.java
@@ -48,7 +48,7 @@ public class NettyHttpRawQueryTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/")
+ from("netty-http:http://0.0.0.0:{{port}}/")
.to(mockEndpoint);
}
};
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
index 6db13535..e6a581c 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java
@@ -61,10 +61,10 @@ public class NettyHttpRedeliveryTest extends BaseNettyTest {
});
from("timer:foo").routeId("foo")
- .to("netty4-http:http://0.0.0.0:{{port}}/bar?keepAlive=false&disconnect=true")
+ .to("netty-http:http://0.0.0.0:{{port}}/bar?keepAlive=false&disconnect=true")
.to("mock:result");
- from("netty4-http:http://0.0.0.0:{{port}}/bar").routeId("bar").autoStartup(false)
+ from("netty-http:http://0.0.0.0:{{port}}/bar").routeId("bar").autoStartup(false)
.setBody().constant("Bye World");
}
};
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectNoLocationTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectNoLocationTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectNoLocationTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectNoLocationTest.java
index b494865..0d9db3c 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectNoLocationTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectNoLocationTest.java
@@ -29,7 +29,7 @@ public class NettyHttpRedirectNoLocationTest extends BaseNettyTest {
@Test
public void testHttpRedirectNoLocation() throws Exception {
try {
- template.requestBody("netty4-http:http://localhost:" + nextPort + "/test", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:" + nextPort + "/test", "Hello World", String.class);
fail("Should have thrown an exception");
} catch (RuntimeCamelException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -47,7 +47,7 @@ public class NettyHttpRedirectNoLocationTest extends BaseNettyTest {
public void configure() throws Exception {
nextPort = getNextPort();
- from("netty4-http:http://localhost:" + nextPort + "/test")
+ from("netty-http:http://localhost:" + nextPort + "/test")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 302);
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectTest.java
index e825acb..789f406 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectTest.java
@@ -27,7 +27,7 @@ public class NettyHttpRedirectTest extends BaseNettyTest {
@Test
public void testHttpRedirect() throws Exception {
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/test", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/test", "Hello World", String.class);
fail("Should have thrown an exception");
} catch (RuntimeCamelException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -43,7 +43,7 @@ public class NettyHttpRedirectTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/test")
+ from("netty-http:http://localhost:{{port}}/test")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 301);
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRequestTimeoutTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRequestTimeoutTest.java
similarity index 91%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRequestTimeoutTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRequestTimeoutTest.java
index 2088450..4face64 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRequestTimeoutTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRequestTimeoutTest.java
@@ -28,7 +28,7 @@ public class NettyHttpRequestTimeoutTest extends BaseNettyTest {
@Test
public void testRequestTimeout() throws Exception {
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/timeout?requestTimeout=1000", "Hello Camel", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/timeout?requestTimeout=1000", "Hello Camel", String.class);
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
ReadTimeoutException cause = assertIsInstanceOf(ReadTimeoutException.class, e.getCause());
@@ -41,7 +41,7 @@ public class NettyHttpRequestTimeoutTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/timeout")
+ from("netty-http:http://localhost:{{port}}/timeout")
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestContextPathMatcherTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestContextPathMatcherTest.java
similarity index 57%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestContextPathMatcherTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestContextPathMatcherTest.java
index 4c16ceb..bb680c7 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestContextPathMatcherTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestContextPathMatcherTest.java
@@ -25,21 +25,21 @@ public class NettyHttpRestContextPathMatcherTest extends BaseNettyTest {
@Test
public void shouldReturnCustomResponseForOptions() throws Exception {
- String response = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", "", HTTP_METHOD, "OPTIONS", String.class);
+ String response = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", "", HTTP_METHOD, "OPTIONS", String.class);
assertEquals("expectedOptionsResponse", response);
}
@Test
public void shouldPreferStrictMatchOverPrefixMatch() throws Exception {
- String response = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/path2/foo", "", HTTP_METHOD, "GET", String.class);
+ String response = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/path2/foo", "", HTTP_METHOD, "GET", String.class);
assertEquals("exact", response);
}
@Test
public void shouldPreferOptionsForEqualPaths() throws Exception {
- String response = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/path3", "", HTTP_METHOD, "POST", String.class);
+ String response = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/path3", "", HTTP_METHOD, "POST", String.class);
assertEquals("postPath3", response);
- response = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/path3", "", HTTP_METHOD, "OPTIONS", String.class);
+ response = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/path3", "", HTTP_METHOD, "OPTIONS", String.class);
assertEquals("optionsPath3", response);
}
@@ -48,14 +48,14 @@ public class NettyHttpRestContextPathMatcherTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/path1?httpMethodRestrict=POST").setBody().constant("somePostResponse");
- from("netty4-http:http://0.0.0.0:{{port}}?matchOnUriPrefix=true&httpMethodRestrict=OPTIONS").setBody().constant("expectedOptionsResponse");
+ from("netty-http:http://0.0.0.0:{{port}}/path1?httpMethodRestrict=POST").setBody().constant("somePostResponse");
+ from("netty-http:http://0.0.0.0:{{port}}?matchOnUriPrefix=true&httpMethodRestrict=OPTIONS").setBody().constant("expectedOptionsResponse");
- from("netty4-http:http://0.0.0.0:{{port}}/path2/foo").setBody().constant("exact");
- from("netty4-http:http://0.0.0.0:{{port}}/path2?matchOnUriPrefix=true").setBody().constant("wildcard");
+ from("netty-http:http://0.0.0.0:{{port}}/path2/foo").setBody().constant("exact");
+ from("netty-http:http://0.0.0.0:{{port}}/path2?matchOnUriPrefix=true").setBody().constant("wildcard");
- from("netty4-http:http://0.0.0.0:{{port}}/path3?httpMethodRestrict=POST").setBody().constant("postPath3");
- from("netty4-http:http://0.0.0.0:{{port}}/path3?httpMethodRestrict=OPTIONS").setBody().constant("optionsPath3");
+ from("netty-http:http://0.0.0.0:{{port}}/path3?httpMethodRestrict=POST").setBody().constant("postPath3");
+ from("netty-http:http://0.0.0.0:{{port}}/path3?httpMethodRestrict=OPTIONS").setBody().constant("optionsPath3");
}
};
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestOptionsAllowTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestOptionsAllowTest.java
similarity index 91%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestOptionsAllowTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestOptionsAllowTest.java
index ec86701..72e3544 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestOptionsAllowTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestOptionsAllowTest.java
@@ -30,7 +30,7 @@ public class NettyHttpRestOptionsAllowTest extends BaseNettyTest {
@Test
public void shouldGetAllowMethods() throws Exception {
- Exchange response = template.request("netty4-http:http://localhost:{{port}}/myapp", new Processor() {
+ Exchange response = template.request("netty-http:http://localhost:{{port}}/myapp", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.OPTIONS);
@@ -50,7 +50,7 @@ public class NettyHttpRestOptionsAllowTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/myapp").setBody().constant("options");
+ from("netty-http:http://0.0.0.0:{{port}}/myapp").setBody().constant("options");
}
};
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnDataNotInputStreamConvertableTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnDataNotInputStreamConvertableTest.java
similarity index 91%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnDataNotInputStreamConvertableTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnDataNotInputStreamConvertableTest.java
index c24d014..1f355db 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnDataNotInputStreamConvertableTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnDataNotInputStreamConvertableTest.java
@@ -25,7 +25,7 @@ public class NettyHttpReturnDataNotInputStreamConvertableTest extends BaseNettyT
@Test
public void testHttpReturnDataNotInputStreamConvertableTest() throws Exception {
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/test", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/test", "Hello World", String.class);
assertEquals("This is the response", out);
}
@@ -34,7 +34,7 @@ public class NettyHttpReturnDataNotInputStreamConvertableTest extends BaseNettyT
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:{{port}}/test")
+ from("netty-http:http://localhost:{{port}}/test")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody(new MyResponseBean());
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java
similarity index 90%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java
index 109c733..a893bc3 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java
@@ -39,7 +39,7 @@ public class NettyHttpSSLHandshakeErrorTest extends BaseNettyTest {
context.addRoutes(new RouteBuilder() {
public void configure() {
- from("netty4-http:https://localhost:{{port}}?ssl=true&needClientAuth=true&keyStoreFormat=JKS"
+ from("netty-http:https://localhost:{{port}}?ssl=true&needClientAuth=true&keyStoreFormat=JKS"
+ "&passphrase=storepassword&keyStoreResource=jsse/server-keystore.jks&trustStoreResource=jsse/server-truststore.jks")
.to("mock:target");
}
@@ -48,7 +48,7 @@ public class NettyHttpSSLHandshakeErrorTest extends BaseNettyTest {
DefaultExchange exchange = new DefaultExchange(context);
- Exchange response = template.send("netty4-http:https://localhost:{{port}}?requestTimeout=10000&throwExceptionOnFailure=false"
+ Exchange response = template.send("netty-http:https://localhost:{{port}}?requestTimeout=10000&throwExceptionOnFailure=false"
+ "&ssl=true&keyStoreFormat=JKS&passphrase=storepassword&keyStoreResource=jsse/client-keystore.jks&trustStoreResource=jsse/server-truststore.jks", exchange);
Exception ex = response.getException();
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
index 540b66c..bf17f48 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
@@ -86,7 +86,7 @@ public class NettyHttpSSLTest extends BaseNettyTest {
context.addRoutes(new RouteBuilder() {
public void configure() {
- from("netty4-http:https://localhost:{{port}}?ssl=true&passphrase=changeit&keyStoreResource=jsse/localhost.ks&trustStoreResource=jsse/localhost.ks")
+ from("netty-http:https://localhost:{{port}}?ssl=true&passphrase=changeit&keyStoreResource=jsse/localhost.ks&trustStoreResource=jsse/localhost.ks")
.to("mock:input")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSameHostDifferentParametersTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSameHostDifferentParametersTest.java
similarity index 84%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSameHostDifferentParametersTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSameHostDifferentParametersTest.java
index 4838e0d..456dd67 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSameHostDifferentParametersTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSameHostDifferentParametersTest.java
@@ -28,10 +28,10 @@ public class NettyHttpSameHostDifferentParametersTest extends BaseNettyTest {
getMockEndpoint("mock:foo").message(0).header("param1").isEqualTo("value1");
getMockEndpoint("mock:foo").message(1).header("param2").isEqualTo("value2");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo?param1=value1", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo?param1=value1", "Hello World", String.class);
assertEquals("param1=value1", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/foo?param2=value2", "Hello Camel", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/foo?param2=value2", "Hello Camel", String.class);
assertEquals("param2=value2", out);
assertMockEndpointsSatisfied();
@@ -42,7 +42,7 @@ public class NettyHttpSameHostDifferentParametersTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:foo")
.transform().header(Exchange.HTTP_QUERY);
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAwareTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAwareTest.java
similarity index 81%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAwareTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAwareTest.java
index 1ae3938..338a851 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAwareTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAwareTest.java
@@ -31,10 +31,10 @@ public class NettyHttpSendDynamicAwareTest extends BaseNettyTest {
assertEquals("Drinking wine", out);
// and there should only be one http endpoint as they are both on same host
- boolean found = context.getEndpointMap().containsKey("netty4-http://http:localhost:" + getPort() + "?throwExceptionOnFailure=false");
+ boolean found = context.getEndpointMap().containsKey("netty-http://http:localhost:" + getPort() + "?throwExceptionOnFailure=false");
assertTrue("Should find static uri", found);
- // we only have 2xdirect and 2xnetty4-http
+ // we only have 2xdirect and 2xnetty-http
assertEquals(4, context.getEndpointMap().size());
}
@@ -44,12 +44,12 @@ public class NettyHttpSendDynamicAwareTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
from("direct:moes")
- .toD("netty4-http:http://localhost:{{port}}/moes?throwExceptionOnFailure=false&drink=${header.drink}");
+ .toD("netty-http:http://localhost:{{port}}/moes?throwExceptionOnFailure=false&drink=${header.drink}");
from("direct:joes")
- .toD("netty4-http:http://localhost:{{port}}/joes?throwExceptionOnFailure=false&drink=${header.drink}");
+ .toD("netty-http:http://localhost:{{port}}/joes?throwExceptionOnFailure=false&drink=${header.drink}");
- from("netty4-http:http://localhost:{{port}}/?matchOnUriPrefix=true")
+ from("netty-http:http://localhost:{{port}}/?matchOnUriPrefix=true")
.transform().simple("Drinking ${header.drink[0]}");
}
};
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java
similarity index 86%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java
index fbe35c9..e7b0659 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java
@@ -53,11 +53,11 @@ public class NettyHttpSimpleBasicAuthConstraintMapperTest extends BaseNettyTest
getMockEndpoint("mock:input").expectedBodiesReceived("Hello Public", "Hello World");
// we dont need auth for the public page
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo/public/hello.txt", "Hello Public", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo/public/hello.txt", "Hello Public", String.class);
assertEquals("Bye World", out);
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
fail("Should send back 401");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -66,7 +66,7 @@ public class NettyHttpSimpleBasicAuthConstraintMapperTest extends BaseNettyTest
// username:password is scott:secret
String auth = "Basic c2NvdHQ6c2VjcmV0";
- out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
+ out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -77,7 +77,7 @@ public class NettyHttpSimpleBasicAuthConstraintMapperTest extends BaseNettyTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo?matchOnUriPrefix=true"
+ from("netty-http:http://0.0.0.0:{{port}}/foo?matchOnUriPrefix=true"
+ "&securityConfiguration.realm=karaf&securityConfiguration.securityConstraint=#myConstraint")
.to("mock:input")
.transform().constant("Bye World");
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthTest.java
similarity index 85%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthTest.java
index 913297be..0087f84 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthTest.java
@@ -41,7 +41,7 @@ public class NettyHttpSimpleBasicAuthTest extends BaseNettyTest {
public void testBasicAuth() throws Exception {
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
fail("Should send back 401");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -52,13 +52,13 @@ public class NettyHttpSimpleBasicAuthTest extends BaseNettyTest {
// username:password is scott:secret
String auth = "Basic c2NvdHQ6c2VjcmV0";
- String out = template.requestBodyAndHeader("netty4-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
+ String out = template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo", "Hello World", "Authorization", auth, String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
fail("Should send back 401");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -72,7 +72,7 @@ public class NettyHttpSimpleBasicAuthTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo?securityConfiguration.realm=karaf")
+ from("netty-http:http://0.0.0.0:{{port}}/foo?securityConfiguration.realm=karaf")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleTest.java
similarity index 89%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleTest.java
index 1eed94d..856fce5 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleTest.java
@@ -25,7 +25,7 @@ public class NettyHttpSimpleTest extends BaseNettyTest {
public void testHttpSimple() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -36,7 +36,7 @@ public class NettyHttpSimpleTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleUriParametersTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleUriParametersTest.java
similarity index 89%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleUriParametersTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleUriParametersTest.java
index b881299..513bbe3a 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleUriParametersTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleUriParametersTest.java
@@ -25,7 +25,7 @@ public class NettyHttpSimpleUriParametersTest extends BaseNettyTest {
public void testHttpSimple() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo?name=bar", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo?name=bar", "Hello World", String.class);
assertEquals("Bye bar", out);
assertMockEndpointsSatisfied();
@@ -36,7 +36,7 @@ public class NettyHttpSimpleUriParametersTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.transform().simple("Bye ${header.name}");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpStreamCacheFileResponseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpStreamCacheFileResponseTest.java
similarity index 97%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpStreamCacheFileResponseTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpStreamCacheFileResponseTest.java
index 1090eb8..28dc375 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpStreamCacheFileResponseTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpStreamCacheFileResponseTest.java
@@ -64,7 +64,7 @@ public class NettyHttpStreamCacheFileResponseTest extends BaseNettyTest {
context.getStreamCachingStrategy().setSpoolThreshold(16);
context.setStreamCaching(true);
- from("netty4-http:http://localhost:{{port}}/myserver")
+ from("netty-http:http://localhost:{{port}}/myserver")
// wrap the response in 2 input streams so it will force caching to disk
.transform().constant(new BufferedInputStream(new ByteArrayInputStream(body2.getBytes())))
.to("log:reply");
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResume503Test.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResume503Test.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResume503Test.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResume503Test.java
index 7b17f18..889789c 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResume503Test.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResume503Test.java
@@ -21,7 +21,7 @@ import org.junit.Test;
public class NettyHttpSuspendResume503Test extends BaseNettyTest {
- private String serverUri = "netty4-http:http://localhost:" + getPort() + "/cool?disconnect=true";
+ private String serverUri = "netty-http:http://localhost:" + getPort() + "/cool?disconnect=true";
@Test
public void testNettySuspendResume() throws Exception {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResumeTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResumeTest.java
similarity index 94%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResumeTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResumeTest.java
index c49f7a3..8f0f817 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResumeTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResumeTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
public class NettyHttpSuspendResumeTest extends BaseNettyTest {
- private String serverUri = "netty4-http:http://localhost:" + getPort() + "/cool?disconnect=true&send503whenSuspended=false";
+ private String serverUri = "netty-http:http://localhost:" + getPort() + "/cool?disconnect=true&send503whenSuspended=false";
@Test
public void testNettySuspendResume() throws Exception {
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTraceDisabledTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTraceDisabledTest.java
similarity index 91%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTraceDisabledTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTraceDisabledTest.java
index 8a18adf..e86e841 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTraceDisabledTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTraceDisabledTest.java
@@ -53,8 +53,8 @@ public class NettyHttpTraceDisabledTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://localhost:" + portTraceOff + "/myservice").to("log:foo");
- from("netty4-http:http://localhost:" + portTraceOn + "/myservice?traceEnabled=true").to("log:bar");
+ from("netty-http:http://localhost:" + portTraceOff + "/myservice").to("log:foo");
+ from("netty-http:http://localhost:" + portTraceOn + "/myservice?traceEnabled=true").to("log:bar");
}
};
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTransferExceptionTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTransferExceptionTest.java
similarity index 89%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTransferExceptionTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTransferExceptionTest.java
index df7def7..ea7aff6 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTransferExceptionTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTransferExceptionTest.java
@@ -27,7 +27,7 @@ public class NettyHttpTransferExceptionTest extends BaseNettyTest {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/foo?transferException=true", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/foo?transferException=true", "Hello World", String.class);
fail("Should have failed");
} catch (CamelExecutionException e) {
IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
@@ -42,7 +42,7 @@ public class NettyHttpTransferExceptionTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo?transferException=true")
+ from("netty-http:http://0.0.0.0:{{port}}/foo?transferException=true")
.to("mock:input")
.throwException(new IllegalArgumentException("Camel cannot do this"));
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesBootstrapConfigurationTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesBootstrapConfigurationTest.java
similarity index 87%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesBootstrapConfigurationTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesBootstrapConfigurationTest.java
index f3a5452..dca5a4e 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesBootstrapConfigurationTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesBootstrapConfigurationTest.java
@@ -45,10 +45,10 @@ public class NettyHttpTwoRoutesBootstrapConfigurationTest extends BaseNettyTest
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:bar").expectedBodiesReceived("Hello Camel");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
assertEquals("Bye Camel", out);
assertMockEndpointsSatisfied();
@@ -74,13 +74,13 @@ public class NettyHttpTwoRoutesBootstrapConfigurationTest extends BaseNettyTest
public void configure() throws Exception {
// we want to use the same bootstrap options and want to configure this explicit, so we
// have a NettyServerBootstrapConfiguration instance in the registry, with the key = myBootstrapOptions
- // which we then tell netty4-http to lookup and use
+ // which we then tell netty-http to lookup and use
- from("netty4-http:http://0.0.0.0:{{port}}/foo?bootstrapConfiguration=#myBootstrapOptions").routeId("foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo?bootstrapConfiguration=#myBootstrapOptions").routeId("foo")
.to("mock:foo")
.transform().constant("Bye World");
- from("netty4-http:http://0.0.0.0:{{port}}/bar?bootstrapConfiguration=#myBootstrapOptions").routeId("bar")
+ from("netty-http:http://0.0.0.0:{{port}}/bar?bootstrapConfiguration=#myBootstrapOptions").routeId("bar")
.to("mock:bar")
.transform().constant("Bye Camel");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java
similarity index 79%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java
index eac00a4..a41f6d5 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java
@@ -27,12 +27,12 @@ public class NettyHttpTwoRoutesMatchOnUriPrefixTest extends BaseNettyTest {
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:bar").expectedBodiesReceived("Hello Camel", "Hi Camel");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
// the foo is not match on prefix so we cannot do /foo/beer
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/foo/beer", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/foo/beer", "Hello World", String.class);
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
@@ -41,18 +41,18 @@ public class NettyHttpTwoRoutesMatchOnUriPrefixTest extends BaseNettyTest {
// .. and likewise baz is not a context-path we have mapped as input
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/baz", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/baz", "Hello World", String.class);
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
assertEquals(404, cause.getStatusCode());
}
- out = template.requestBody("netty4-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
assertEquals("Bye Camel", out);
// the bar is match on prefix so we can do /bar/beer
- out = template.requestBody("netty4-http:http://localhost:{{port}}/bar/beer", "Hi Camel", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/bar/beer", "Hi Camel", String.class);
assertEquals("Bye Camel", out);
assertMockEndpointsSatisfied();
@@ -63,11 +63,11 @@ public class NettyHttpTwoRoutesMatchOnUriPrefixTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:foo")
.transform().constant("Bye World");
- from("netty4-http:http://0.0.0.0:{{port}}/bar?matchOnUriPrefix=true")
+ from("netty-http:http://0.0.0.0:{{port}}/bar?matchOnUriPrefix=true")
.to("mock:bar")
.transform().constant("Bye Camel");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesStopOneRouteTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesStopOneRouteTest.java
similarity index 80%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesStopOneRouteTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesStopOneRouteTest.java
index 506303d..0fb499e 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesStopOneRouteTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesStopOneRouteTest.java
@@ -27,10 +27,10 @@ public class NettyHttpTwoRoutesStopOneRouteTest extends BaseNettyTest {
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:bar").expectedBodiesReceived("Hello Camel");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
assertEquals("Bye Camel", out);
assertMockEndpointsSatisfied();
@@ -45,14 +45,14 @@ public class NettyHttpTwoRoutesStopOneRouteTest extends BaseNettyTest {
// the foo route is stopped so this service is no longer there
try {
- template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
assertEquals(404, cause.getStatusCode());
}
- out = template.requestBody("netty4-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
assertEquals("Bye Camel", out);
assertMockEndpointsSatisfied();
@@ -63,11 +63,11 @@ public class NettyHttpTwoRoutesStopOneRouteTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo").routeId("foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo").routeId("foo")
.to("mock:foo")
.transform().constant("Bye World");
- from("netty4-http:http://0.0.0.0:{{port}}/bar").routeId("bar")
+ from("netty-http:http://0.0.0.0:{{port}}/bar").routeId("bar")
.to("mock:bar")
.transform().constant("Bye Camel");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesTest.java
similarity index 83%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesTest.java
index da17f60..bea3373 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesTest.java
@@ -26,10 +26,10 @@ public class NettyHttpTwoRoutesTest extends BaseNettyTest {
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:bar").expectedBodiesReceived("Hello Camel");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
assertEquals("Bye Camel", out);
assertMockEndpointsSatisfied();
@@ -40,11 +40,11 @@ public class NettyHttpTwoRoutesTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:foo")
.transform().constant("Bye World");
- from("netty4-http:http://0.0.0.0:{{port}}/bar")
+ from("netty-http:http://0.0.0.0:{{port}}/bar")
.to("mock:bar")
.transform().constant("Bye Camel");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesValidateBootstrapConfigurationTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesValidateBootstrapConfigurationTest.java
similarity index 91%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesValidateBootstrapConfigurationTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesValidateBootstrapConfigurationTest.java
index 2dedde2..0fdfd9b 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesValidateBootstrapConfigurationTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesValidateBootstrapConfigurationTest.java
@@ -31,12 +31,12 @@ public class NettyHttpTwoRoutesValidateBootstrapConfigurationTest extends BaseNe
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo?option.child.keepAlive=false")
+ from("netty-http:http://0.0.0.0:{{port}}/foo?option.child.keepAlive=false")
.to("mock:foo")
.transform().constant("Bye World");
// we cannot have a 2nd route on same port with different option that the 1st route
- from("netty4-http:http://0.0.0.0:{{port}}/bar?option.child.keepAlive=true")
+ from("netty-http:http://0.0.0.0:{{port}}/bar?option.child.keepAlive=true")
.to("mock:bar")
.transform().constant("Bye Camel");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathResponseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathResponseTest.java
similarity index 79%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathResponseTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathResponseTest.java
index ac91c42..9d3949a 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathResponseTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathResponseTest.java
@@ -23,13 +23,13 @@ public class NettyHttpXMLXPathResponseTest extends BaseNettyTest {
@Test
public void testHttpXML() throws Exception {
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "<person><name>Claus</name></person>", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "<person><name>Claus</name></person>", String.class);
assertEquals("<name>Claus</name>", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "<person><name>James</name></person>", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "<person><name>James</name></person>", String.class);
assertEquals("James", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "<person><name>Jonathan</name></person>", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "<person><name>Jonathan</name></person>", String.class);
assertEquals("Dont understand <person><name>Jonathan</name></person>", out);
}
@@ -38,7 +38,7 @@ public class NettyHttpXMLXPathResponseTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.choice()
.when().xpath("/person/name = 'Claus'")
.transform(xpath("/person/name"))
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathTest.java
similarity index 79%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathTest.java
index d962d54..d80d9d1 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathTest.java
@@ -23,13 +23,13 @@ public class NettyHttpXMLXPathTest extends BaseNettyTest {
@Test
public void testHttpXML() throws Exception {
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "<person><name>Claus</name></person>", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "<person><name>Claus</name></person>", String.class);
assertEquals("<quote>Camel rocks</quote>", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "<person><name>James</name></person>", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "<person><name>James</name></person>", String.class);
assertEquals("<quote>Camel really rocks</quote>", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "<person><name>Jonathan</name></person>", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "<person><name>Jonathan</name></person>", String.class);
assertEquals("<quote>Try Camel now</quote>", out);
}
@@ -38,7 +38,7 @@ public class NettyHttpXMLXPathTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.choice()
.when().xpath("/person/name = 'Claus'")
.transform(constant("<quote>Camel rocks</quote>"))
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyMDCLoggingTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyMDCLoggingTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyMDCLoggingTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyMDCLoggingTest.java
index 418964c..6e8c81c 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyMDCLoggingTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyMDCLoggingTest.java
@@ -44,11 +44,11 @@ public class NettyMDCLoggingTest extends BaseNettyTest {
from("direct:start").routeId("client")
.to("log:client-input")
- .to("netty4-http:http://localhost:{{port}}/foo")
+ .to("netty-http:http://localhost:{{port}}/foo")
.to("log:client-output")
.to("mock:result");
- from("netty4-http:http://0.0.0.0:{{port}}/foo").routeId("server").streamCaching()
+ from("netty-http:http://0.0.0.0:{{port}}/foo").routeId("server").streamCaching()
.to("log:server-input")
.to("mock:input")
.transform().simple("Bye ${body}")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyMixedCaseHttpPathTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyMixedCaseHttpPathTest.java
similarity index 87%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyMixedCaseHttpPathTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyMixedCaseHttpPathTest.java
index 6a618a0..8728a2f 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyMixedCaseHttpPathTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyMixedCaseHttpPathTest.java
@@ -26,7 +26,7 @@ public class NettyMixedCaseHttpPathTest extends BaseNettyTest {
public void testMixedCase() throws Exception {
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.HTTP_PATH, "/HelloWorld");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/SHoppING/HelloWorld", "Camel", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/SHoppING/HelloWorld", "Camel", String.class);
assertEquals("Bye Camel", out);
assertMockEndpointsSatisfied();
@@ -37,7 +37,7 @@ public class NettyMixedCaseHttpPathTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/Shopping?matchOnUriPrefix=true")
+ from("netty-http:http://0.0.0.0:{{port}}/Shopping?matchOnUriPrefix=true")
.to("mock:input")
.transform(body().prepend("Bye "));
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyProxyMixedCasePathTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyProxyMixedCasePathTest.java
similarity index 74%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyProxyMixedCasePathTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyProxyMixedCasePathTest.java
index 8ec0b4d..29518bb 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyProxyMixedCasePathTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyProxyMixedCasePathTest.java
@@ -23,10 +23,10 @@ public class NettyProxyMixedCasePathTest extends BaseNettyTest {
@Test
public void testMixedCase() throws Exception {
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/Shopping", "Camel", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/Shopping", "Camel", String.class);
assertEquals("Bye Camel", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/shopping", "World", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/shopping", "World", String.class);
assertEquals("Bye World", out);
}
@@ -35,9 +35,9 @@ public class NettyProxyMixedCasePathTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/Shopping").to("netty4-http:http://localhost:{{port}}/ws/svc/Shopping");
+ from("netty-http:http://0.0.0.0:{{port}}/Shopping").to("netty-http:http://localhost:{{port}}/ws/svc/Shopping");
- from("netty4-http:http://0.0.0.0:{{port}}/ws/svc/Shopping").transform(body().prepend("Bye "));
+ from("netty-http:http://0.0.0.0:{{port}}/ws/svc/Shopping").transform(body().prepend("Bye "));
}
};
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRecipientListHttpBaseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRecipientListHttpBaseTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRecipientListHttpBaseTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRecipientListHttpBaseTest.java
index 7fc4491..97d013c 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRecipientListHttpBaseTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRecipientListHttpBaseTest.java
@@ -40,12 +40,12 @@ public class NettyRecipientListHttpBaseTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo?matchOnUriPrefix=true")
+ from("netty-http:http://0.0.0.0:{{port}}/foo?matchOnUriPrefix=true")
.to("mock:foo")
.transform(body().prepend("Bye "));
from("direct:start")
- .recipientList().constant("netty4-http:http://localhost:{{port}}");
+ .recipientList().constant("netty-http:http://localhost:{{port}}");
}
};
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRequestManagementTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRequestManagementTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRequestManagementTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRequestManagementTest.java
index a25c13c..92013e7 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRequestManagementTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRequestManagementTest.java
@@ -44,11 +44,11 @@ public class NettyRequestManagementTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.transform(body().prepend("Bye "));
from("direct:start")
- .to("netty4-http:http://localhost:{{port}}/foo?synchronous=true")
+ .to("netty-http:http://localhost:{{port}}/foo?synchronous=true")
.process(NettyRequestManagementTest::requestBuffer);
}
};
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleDynamicURITest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleDynamicURITest.java
similarity index 84%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleDynamicURITest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleDynamicURITest.java
index 00d2356..a7a35ec 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleDynamicURITest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleDynamicURITest.java
@@ -26,7 +26,7 @@ public class NettyRouteSimpleDynamicURITest extends BaseNettyTest {
getMockEndpoint("mock:input1").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:input2").expectedBodiesReceived("Hello World");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -39,12 +39,12 @@ public class NettyRouteSimpleDynamicURITest extends BaseNettyTest {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input1")
.setHeader("id", constant("bar"))
.setHeader("host", constant("localhost"))
- .toD("netty4-http:http://${header.host}:" + port2 + "/${header.id}");
- from("netty4-http:http://0.0.0.0:" + port2 + "/bar")
+ .toD("netty-http:http://${header.host}:" + port2 + "/${header.id}");
+ from("netty-http:http://0.0.0.0:" + port2 + "/bar")
.to("mock:input2")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleTest.java
similarity index 83%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleTest.java
index af0195d..89cd275 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleTest.java
@@ -26,7 +26,7 @@ public class NettyRouteSimpleTest extends BaseNettyTest {
getMockEndpoint("mock:input1").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:input2").expectedBodiesReceived("Hello World");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -39,10 +39,10 @@ public class NettyRouteSimpleTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input1")
- .to("netty4-http:http://localhost:" + port2 + "/bar");
- from("netty4-http:http://0.0.0.0:" + port2 + "/bar")
+ .to("netty-http:http://localhost:" + port2 + "/bar");
+ from("netty-http:http://0.0.0.0:" + port2 + "/bar")
.to("mock:input2")
.transform().constant("Bye World");
}
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettySharedHttpServerTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettySharedHttpServerTest.java
similarity index 88%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettySharedHttpServerTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettySharedHttpServerTest.java
index 7b27e50..960ef91 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettySharedHttpServerTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettySharedHttpServerTest.java
@@ -54,10 +54,10 @@ public class NettySharedHttpServerTest extends BaseNettyTest {
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:bar").expectedBodiesReceived("Hello Camel");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/bar", "Hello Camel", String.class);
assertEquals("Bye Camel", out);
assertEquals(2, nettySharedHttpServer.getConsumersSize());
@@ -71,13 +71,13 @@ public class NettySharedHttpServerTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
// we are using a shared netty http server, so the port number is not needed to be defined in the uri
- from("netty4-http:http://localhost/foo?nettySharedHttpServer=#myNettyServer")
+ from("netty-http:http://localhost/foo?nettySharedHttpServer=#myNettyServer")
.log("Foo route using thread ${threadName}")
.to("mock:foo")
.transform().constant("Bye World");
// we are using a shared netty http server, so the port number is not needed to be defined in the uri
- from("netty4-http:http://localhost/bar?nettySharedHttpServer=#myNettyServer")
+ from("netty-http:http://localhost/bar?nettySharedHttpServer=#myNettyServer")
.log("Bar route using thread ${threadName}")
.to("mock:bar")
.transform().constant("Bye Camel");
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyUseRawHttpResponseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyUseRawHttpResponseTest.java
similarity index 93%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyUseRawHttpResponseTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyUseRawHttpResponseTest.java
index 3a740b8..b571d49 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyUseRawHttpResponseTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/NettyUseRawHttpResponseTest.java
@@ -33,7 +33,7 @@ public class NettyUseRawHttpResponseTest extends BaseNettyTest {
public void testAccessHttpRequest() throws Exception {
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/foo", "Hello World", String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/foo", "Hello World", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -44,7 +44,7 @@ public class NettyUseRawHttpResponseTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4-http:http://0.0.0.0:{{port}}/foo")
+ from("netty-http:http://0.0.0.0:{{port}}/foo")
.to("mock:input")
.process(new Processor() {
@Override
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/ProxyProtocolTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/ProxyProtocolTest.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/ProxyProtocolTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/ProxyProtocolTest.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SecurityConstraintMappingTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/SecurityConstraintMappingTest.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SecurityConstraintMappingTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/SecurityConstraintMappingTest.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java
similarity index 78%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java
index c449dcd..2b73a30 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java
@@ -68,21 +68,21 @@ public class SpringNettyHttpBasicAuthTest extends Assert {
mockEndpoint.expectedBodiesReceived("Hello Public", "Hello Foo", "Hello Admin");
// public do not need authentication
- String out = template.requestBody("netty4-http:http://localhost:" + port + "/foo/public/welcome", "Hello Public", String.class);
+ String out = template.requestBody("netty-http:http://localhost:" + port + "/foo/public/welcome", "Hello Public", String.class);
assertEquals("Bye /foo/public/welcome", out);
// username:password is scott:secret
String auth = "Basic c2NvdHQ6c2VjcmV0";
- out = template.requestBodyAndHeader("netty4-http:http://localhost:" + port + "/foo", "Hello Foo", "Authorization", auth, String.class);
+ out = template.requestBodyAndHeader("netty-http:http://localhost:" + port + "/foo", "Hello Foo", "Authorization", auth, String.class);
assertEquals("Bye /foo", out);
- out = template.requestBodyAndHeader("netty4-http:http://localhost:" + port + "/foo/admin/users", "Hello Admin", "Authorization", auth, String.class);
+ out = template.requestBodyAndHeader("netty-http:http://localhost:" + port + "/foo/admin/users", "Hello Admin", "Authorization", auth, String.class);
assertEquals("Bye /foo/admin/users", out);
mockEndpoint.assertIsSatisfied();
try {
- template.requestBody("netty4-http:http://localhost:" + port + "/foo", "Hello Foo", String.class);
+ template.requestBody("netty-http:http://localhost:" + port + "/foo", "Hello Foo", String.class);
fail("Should send back 401");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = (NettyHttpOperationFailedException) e.getCause();
@@ -96,16 +96,16 @@ public class SpringNettyHttpBasicAuthTest extends Assert {
public void testGuestAuth() throws Exception {
// username:password is guest:secret
String auth = "Basic Z3Vlc3Q6c2VjcmV0";
- String out = template.requestBodyAndHeader("netty4-http:http://localhost:" + port + "/foo/guest/hello", "Hello Guest", "Authorization", auth, String.class);
+ String out = template.requestBodyAndHeader("netty-http:http://localhost:" + port + "/foo/guest/hello", "Hello Guest", "Authorization", auth, String.class);
assertEquals("Bye /foo/guest/hello", out);
// but we can access foo as that is any roles
- out = template.requestBodyAndHeader("netty4-http:http://localhost:" + port + "/foo", "Hello Foo", "Authorization", auth, String.class);
+ out = template.requestBodyAndHeader("netty-http:http://localhost:" + port + "/foo", "Hello Foo", "Authorization", auth, String.class);
assertEquals("Bye /foo", out);
// accessing admin is restricted for guest user
try {
- template.requestBodyAndHeader("netty4-http:http://localhost:" + port + "/foo/admin/users", "Hello Admin", "Authorization", auth, String.class);
+ template.requestBodyAndHeader("netty-http:http://localhost:" + port + "/foo/admin/users", "Hello Admin", "Authorization", auth, String.class);
fail("Should send back 401");
} catch (CamelExecutionException e) {
NettyHttpOperationFailedException cause = (NettyHttpOperationFailedException) e.getCause();
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceCallRouteTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceCallRouteTest.java
similarity index 94%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceCallRouteTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceCallRouteTest.java
index a80762b..d1522fd 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceCallRouteTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceCallRouteTest.java
@@ -49,7 +49,7 @@ public class Netty4HttpServiceCallRouteTest extends CamelTestSupport {
from("direct:custom")
.serviceCall()
.name("myService")
- .component("netty4-http")
+ .component("netty-http")
.staticServiceDiscovery()
.servers("myService@localhost:8081")
.servers("myService@localhost:8082")
@@ -63,9 +63,9 @@ public class Netty4HttpServiceCallRouteTest extends CamelTestSupport {
.servers("myService@localhost:8082")
.endParent();
- from("netty4-http:http://localhost:8081")
+ from("netty-http:http://localhost:8081")
.transform().constant("8081");
- from("netty4-http:http://localhost:8082")
+ from("netty-http:http://localhost:8082")
.transform().constant("8082");
}
};
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/CountryPojo.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/CountryPojo.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/CountryPojo.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/CountryPojo.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestApiNettyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestApiNettyTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestApiNettyTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestApiNettyTest.java
index 211f731..25bda74 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestApiNettyTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestApiNettyTest.java
@@ -32,7 +32,7 @@ public class RestApiNettyTest extends BaseNettyTest {
@Test
public void testApi() throws Exception {
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/api-doc", null, String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/api-doc", null, String.class);
assertNotNull(out);
log.info(out);
@@ -48,7 +48,7 @@ public class RestApiNettyTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).apiContextPath("/api-doc")
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).apiContextPath("/api-doc")
.apiProperty("cors", "true").apiProperty("api.title", "The hello rest thing").apiProperty("api.version", "1.2.3");
rest("/hello").consumes("application/json").produces("application/json")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithJsonTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithJsonTest.java
similarity index 90%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithJsonTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithJsonTest.java
index fe2c2c0..960c3f7 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithJsonTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithJsonTest.java
@@ -31,7 +31,7 @@ public class RestNettyHttpBindingModeAutoWithJsonTest extends BaseNettyTest {
mock.message(0).body().isInstanceOf(UserPojo.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- template.sendBody("netty4-http:http://localhost:" + getPort() + "/users/new", body);
+ template.sendBody("netty-http:http://localhost:" + getPort() + "/users/new", body);
assertMockEndpointsSatisfied();
@@ -46,7 +46,7 @@ public class RestNettyHttpBindingModeAutoWithJsonTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithXmlTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithXmlTest.java
similarity index 90%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithXmlTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithXmlTest.java
index 3a3341f..1d5423f 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithXmlTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithXmlTest.java
@@ -31,7 +31,7 @@ public class RestNettyHttpBindingModeAutoWithXmlTest extends BaseNettyTest {
mock.message(0).body().isInstanceOf(UserJaxbPojo.class);
String body = "<user name=\"Donald Duck\" id=\"123\"></user>";
- template.sendBody("netty4-http:http://localhost:" + getPort() + "/users/new", body);
+ template.sendBody("netty-http:http://localhost:" + getPort() + "/users/new", body);
assertMockEndpointsSatisfied();
@@ -46,7 +46,7 @@ public class RestNettyHttpBindingModeAutoWithXmlTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonTest.java
similarity index 89%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonTest.java
index 893b934..924515a 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonTest.java
@@ -31,7 +31,7 @@ public class RestNettyHttpBindingModeJsonTest extends BaseNettyTest {
mock.message(0).body().isInstanceOf(UserJaxbPojo.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- template.sendBody("netty4-http:http://localhost:" + getPort() + "/users/new", body);
+ template.sendBody("netty-http:http://localhost:" + getPort() + "/users/new", body);
assertMockEndpointsSatisfied();
@@ -49,7 +49,7 @@ public class RestNettyHttpBindingModeJsonTest extends BaseNettyTest {
// we bind to json, but send in xml, which is not possible
String body = "<user name=\"Donald Duck\" id=\"123\"></user>";
try {
- template.sendBody("netty4-http:http://localhost:" + getPort() + "/users/new", body);
+ template.sendBody("netty-http:http://localhost:" + getPort() + "/users/new", body);
fail("Should have thrown exception");
} catch (Exception e) {
// expected
@@ -63,7 +63,7 @@ public class RestNettyHttpBindingModeJsonTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.json);
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.json);
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonWithContractTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonWithContractTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonWithContractTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonWithContractTest.java
index 1c2bab3..7ad5b1f 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonWithContractTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonWithContractTest.java
@@ -33,7 +33,7 @@ public class RestNettyHttpBindingModeJsonWithContractTest extends BaseNettyTest
mock.message(0).body().isInstanceOf(UserPojoEx.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- Object answer = template.requestBody("netty4-http:http://localhost:" + getPort() + "/users/new", body);
+ Object answer = template.requestBody("netty-http:http://localhost:" + getPort() + "/users/new", body);
assertNotNull(answer);
String answerString = new String((byte[])answer);
assertTrue("Unexpected response: " + answerString, answerString.contains("\"active\":true"));
@@ -55,7 +55,7 @@ public class RestNettyHttpBindingModeJsonWithContractTest extends BaseNettyTest
@Override
public void configure() throws Exception {
context.getTypeConverterRegistry().addTypeConverters(new MyTypeConverters());
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.json);
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.json);
rest("/users/")
// REST binding converts from JSON to UserPojo
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeOffWithContractTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeOffWithContractTest.java
similarity index 92%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeOffWithContractTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeOffWithContractTest.java
index 34a2f1d..b328920 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeOffWithContractTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeOffWithContractTest.java
@@ -34,7 +34,7 @@ public class RestNettyHttpBindingModeOffWithContractTest extends BaseNettyTest {
mock.message(0).body().isInstanceOf(UserPojoEx.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- Object answer = template.requestBodyAndHeader("netty4-http:http://localhost:" + getPort() + "/users/new", body, Exchange.CONTENT_TYPE, "application/json");
+ Object answer = template.requestBodyAndHeader("netty-http:http://localhost:" + getPort() + "/users/new", body, Exchange.CONTENT_TYPE, "application/json");
assertNotNull(answer);
String answerString = new String((byte[])answer);
assertTrue("Unexpected response: " + answerString, answerString.contains("\"active\":true"));
@@ -55,7 +55,7 @@ public class RestNettyHttpBindingModeOffWithContractTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.off);
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.off);
JsonDataFormat jsondf = new JsonDataFormat();
jsondf.setLibrary(JsonLibrary.Jackson);
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeXmlTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeXmlTest.java
similarity index 89%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeXmlTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeXmlTest.java
index d682ffd..261c6ee 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeXmlTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeXmlTest.java
@@ -31,7 +31,7 @@ public class RestNettyHttpBindingModeXmlTest extends BaseNettyTest {
mock.message(0).body().isInstanceOf(UserJaxbPojo.class);
String body = "<user name=\"Donald Duck\" id=\"123\"></user>";
- template.sendBody("netty4-http:http://localhost:" + getPort() + "/users/new", body);
+ template.sendBody("netty-http:http://localhost:" + getPort() + "/users/new", body);
assertMockEndpointsSatisfied();
@@ -49,7 +49,7 @@ public class RestNettyHttpBindingModeXmlTest extends BaseNettyTest {
// we bind to xml, but send in json, which is not possible
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
try {
- template.sendBody("netty4-http:http://localhost:" + getPort() + "/users/new", body);
+ template.sendBody("netty-http:http://localhost:" + getPort() + "/users/new", body);
fail("Should have thrown exception");
} catch (Exception e) {
// expected
@@ -64,7 +64,7 @@ public class RestNettyHttpBindingModeXmlTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.xml);
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.xml);
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathConfigurationTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathConfigurationTest.java
similarity index 85%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathConfigurationTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathConfigurationTest.java
index 69d608c..f6fb674 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathConfigurationTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathConfigurationTest.java
@@ -26,10 +26,10 @@ public class RestNettyHttpContextPathConfigurationTest extends BaseNettyTest {
@Test
public void testProducerGet() throws Exception {
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/rest/users/123", null, String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/rest/users/123", null, String.class);
assertEquals("123;Donald Duck", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/rest/users/list", null, String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/rest/users/list", null, String.class);
assertEquals("123;Donald Duck\n456;John Doe", out);
}
@@ -38,8 +38,8 @@ public class RestNettyHttpContextPathConfigurationTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // configure to use netty4-http on localhost with the given port
- restConfiguration().component("netty4-http").contextPath("/rest").host("localhost").port(getPort());
+ // configure to use netty-http on localhost with the given port
+ restConfiguration().component("netty-http").contextPath("/rest").host("localhost").port(getPort());
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathMatchGetTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathMatchGetTest.java
similarity index 86%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathMatchGetTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathMatchGetTest.java
index f3d2d23..6419209 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathMatchGetTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathMatchGetTest.java
@@ -26,10 +26,10 @@ public class RestNettyHttpContextPathMatchGetTest extends BaseNettyTest {
@Test
public void testProducerGet() throws Exception {
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/users/123", null, String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/users/123", null, String.class);
assertEquals("123;Donald Duck", out);
- out = template.requestBody("netty4-http:http://localhost:{{port}}/users/list", null, String.class);
+ out = template.requestBody("netty-http:http://localhost:{{port}}/users/list", null, String.class);
assertEquals("123;Donald Duck\n456;John Doe", out);
}
@@ -38,8 +38,8 @@ public class RestNettyHttpContextPathMatchGetTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // configure to use netty4-http on localhost with the given port
- restConfiguration().component("netty4-http").host("localhost").port(getPort());
+ // configure to use netty-http on localhost with the given port
+ restConfiguration().component("netty-http").host("localhost").port(getPort());
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetCorsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetCorsTest.java
similarity index 94%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetCorsTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetCorsTest.java
index fe775c1..d7b1706 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetCorsTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetCorsTest.java
@@ -60,8 +60,8 @@ public class RestNettyHttpGetCorsTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // configure to use netty4-http on localhost with the given port
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).enableCORS(true);
+ // configure to use netty-http on localhost with the given port
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).enableCORS(true);
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetTest.java
similarity index 86%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetTest.java
index dfc7f0d..5ca1368 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetTest.java
@@ -31,7 +31,7 @@ public class RestNettyHttpGetTest extends BaseNettyTest {
@Test
public void testProducerGet() throws Exception {
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/users/123/basic", null, String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/users/123/basic", null, String.class);
assertEquals("123;Donald Duck", out);
}
@@ -40,8 +40,8 @@ public class RestNettyHttpGetTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // configure to use netty4-http on localhost with the given port
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).endpointProperty("nettyHttpBinding", "#mybinding");
+ // configure to use netty-http on localhost with the given port
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).endpointProperty("nettyHttpBinding", "#mybinding");
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetWildcardsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetWildcardsTest.java
similarity index 85%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetWildcardsTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetWildcardsTest.java
index 456222b..791be80 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetWildcardsTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetWildcardsTest.java
@@ -31,13 +31,13 @@ public class RestNettyHttpGetWildcardsTest extends BaseNettyTest {
@Test
public void testProducerGet() throws Exception {
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/users/123/basic", null, String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/users/123/basic", null, String.class);
assertEquals("123;Donald Duck", out);
}
@Test
public void testServletProducerGetWildcards() throws Exception {
- String out = template.requestBody("netty4-http:http://localhost:{{port}}/users/456/name=g*", null, String.class);
+ String out = template.requestBody("netty-http:http://localhost:{{port}}/users/456/name=g*", null, String.class);
assertEquals("456;Goofy", out);
}
@@ -46,8 +46,8 @@ public class RestNettyHttpGetWildcardsTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // configure to use netty4-http on localhost with the given port
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).endpointProperty("nettyHttpBinding", "#mybinding");
+ // configure to use netty-http on localhost with the given port
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).endpointProperty("nettyHttpBinding", "#mybinding");
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpOptionsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpOptionsTest.java
similarity index 97%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpOptionsTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpOptionsTest.java
index ac3ef22..ac2f51e 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpOptionsTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpOptionsTest.java
@@ -63,7 +63,7 @@ public class RestNettyHttpOptionsTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
// configure to use netty on localhost with the given port
- restConfiguration().component("netty4-http").host("localhost").port(getPort());
+ restConfiguration().component("netty-http").host("localhost").port(getPort());
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPojoInOutTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPojoInOutTest.java
similarity index 84%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPojoInOutTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPojoInOutTest.java
index 6eb8125..2500dbf 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPojoInOutTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPojoInOutTest.java
@@ -26,7 +26,7 @@ public class RestNettyHttpPojoInOutTest extends BaseNettyTest {
@Test
public void testNettyPojoInOut() throws Exception {
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- String out = template.requestBody("netty4-http:http://localhost:" + getPort() + "/users/lives", body, String.class);
+ String out = template.requestBody("netty-http:http://localhost:" + getPort() + "/users/lives", body, String.class);
assertNotNull(out);
assertEquals("{\"iso\":\"EN\",\"country\":\"England\"}", out);
@@ -34,7 +34,7 @@ public class RestNettyHttpPojoInOutTest extends BaseNettyTest {
@Test
public void testNettyGetRequest() throws Exception {
- String out = template.requestBody("netty4-http:http://localhost:" + getPort() + "/users/lives", null, String.class);
+ String out = template.requestBody("netty-http:http://localhost:" + getPort() + "/users/lives", null, String.class);
assertNotNull(out);
assertEquals("{\"iso\":\"EN\",\"country\":\"England\"}", out);
@@ -45,9 +45,9 @@ public class RestNettyHttpPojoInOutTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // configure to use netty4-http on localhost with the given port
+ // configure to use netty-http on localhost with the given port
// and enable auto binding mode
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonJaxbPojoTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonJaxbPojoTest.java
similarity index 87%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonJaxbPojoTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonJaxbPojoTest.java
index 0c9077f..e3602ac 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonJaxbPojoTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonJaxbPojoTest.java
@@ -31,7 +31,7 @@ public class RestNettyHttpPostJsonJaxbPojoTest extends BaseNettyTest {
mock.message(0).body().isInstanceOf(UserJaxbPojo.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- template.sendBody("netty4-http:http://localhost:" + getPort() + "/users/new", body);
+ template.sendBody("netty-http:http://localhost:" + getPort() + "/users/new", body);
assertMockEndpointsSatisfied();
@@ -46,9 +46,9 @@ public class RestNettyHttpPostJsonJaxbPojoTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // configure to use netty4-http on localhost with the given port
+ // configure to use netty-http on localhost with the given port
// and enable auto binding mode
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoListTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoListTest.java
similarity index 88%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoListTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoListTest.java
index 07c3c81..cf64b98 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoListTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoListTest.java
@@ -32,7 +32,7 @@ public class RestNettyHttpPostJsonPojoListTest extends BaseNettyTest {
mock.expectedMessageCount(1);
String body = "[ {\"id\": 123, \"name\": \"Donald Duck\"}, {\"id\": 456, \"name\": \"John Doe\"} ]";
- template.sendBody("netty4-http:http://localhost:" + getPort() + "/users/new", body);
+ template.sendBody("netty-http:http://localhost:" + getPort() + "/users/new", body);
assertMockEndpointsSatisfied();
@@ -53,9 +53,9 @@ public class RestNettyHttpPostJsonPojoListTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // configure to use netty4-http on localhost with the given port
+ // configure to use netty-http on localhost with the given port
// and enable auto binding mode
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoTest.java
similarity index 87%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoTest.java
index fd8636a..d521369 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoTest.java
@@ -31,7 +31,7 @@ public class RestNettyHttpPostJsonPojoTest extends BaseNettyTest {
mock.message(0).body().isInstanceOf(UserPojo.class);
String body = "{\"id\": 123, \"name\": \"Donald Duck\"}";
- template.sendBody("netty4-http:http://localhost:" + getPort() + "/users/new", body);
+ template.sendBody("netty-http:http://localhost:" + getPort() + "/users/new", body);
assertMockEndpointsSatisfied();
@@ -46,9 +46,9 @@ public class RestNettyHttpPostJsonPojoTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // configure to use netty4-http on localhost with the given port
+ // configure to use netty-http on localhost with the given port
// and enable auto binding mode
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostXmlJaxbPojoTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostXmlJaxbPojoTest.java
similarity index 86%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostXmlJaxbPojoTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostXmlJaxbPojoTest.java
index 8566a5c..7047125 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostXmlJaxbPojoTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostXmlJaxbPojoTest.java
@@ -32,7 +32,7 @@ public class RestNettyHttpPostXmlJaxbPojoTest extends BaseNettyTest {
mock.message(0).body().isInstanceOf(UserJaxbPojo.class);
String body = "<user name=\"Donald Duck\" id=\"123\"></user>";
- template.sendBodyAndHeader("netty4-http:http://localhost:" + getPort() + "/users/new", body, Exchange.CONTENT_TYPE, "text/xml");
+ template.sendBodyAndHeader("netty-http:http://localhost:" + getPort() + "/users/new", body, Exchange.CONTENT_TYPE, "text/xml");
assertMockEndpointsSatisfied();
@@ -49,7 +49,7 @@ public class RestNettyHttpPostXmlJaxbPojoTest extends BaseNettyTest {
mock.message(0).body().isInstanceOf(UserJaxbPojo.class);
String body = "<user name=\"Donald Duck\" id=\"456\"></user>";
- template.sendBody("netty4-http:http://localhost:" + getPort() + "/users/new", body);
+ template.sendBody("netty-http:http://localhost:" + getPort() + "/users/new", body);
assertMockEndpointsSatisfied();
@@ -64,9 +64,9 @@ public class RestNettyHttpPostXmlJaxbPojoTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // configure to use netty4-http on localhost with the given port
+ // configure to use netty-http on localhost with the given port
// and enable auto binding mode
- restConfiguration().component("netty4-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
+ restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto);
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpVerbTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpVerbTest.java
similarity index 97%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpVerbTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpVerbTest.java
index 2cfcd63..be79550 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpVerbTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpVerbTest.java
@@ -75,7 +75,7 @@ public class RestNettyHttpVerbTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- restConfiguration().component("netty4-http").host("localhost").port(getPort());
+ restConfiguration().component("netty-http").host("localhost").port(getPort());
rest()
.get("/users").route().transform().constant("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\", \"name\":\"Claus\" }]").endRest()
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyMethodNotAllowedTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyMethodNotAllowedTest.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyMethodNotAllowedTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyMethodNotAllowedTest.java
index 47a5e44..2c83c7f 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyMethodNotAllowedTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyMethodNotAllowedTest.java
@@ -49,7 +49,7 @@ public class RestNettyMethodNotAllowedTest extends BaseNettyTest {
@Override
public void configure() {
// configure to use netty on localhost
- restConfiguration().component("netty4-http").host("localhost").port(getPort());
+ restConfiguration().component("netty-http").host("localhost").port(getPort());
// use the rest DSL to define the rest services
rest("/users/")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetTest.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetTest.java
index 7437a68..9e955fb 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetTest.java
@@ -37,7 +37,7 @@ public class RestNettyProducerGetTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
// configure to use netty on localhost with the given port
- restConfiguration().component("netty4-http").host("localhost").port(getPort());
+ restConfiguration().component("netty-http").host("localhost").port(getPort());
from("direct:start")
.to("rest:get:users/{id}/basic");
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetUriParameterTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetUriParameterTest.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetUriParameterTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetUriParameterTest.java
index 0cf146f..15bd040 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetUriParameterTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetUriParameterTest.java
@@ -37,7 +37,7 @@ public class RestNettyProducerGetUriParameterTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
// configure to use netty on localhost with the given port
- restConfiguration().component("netty4-http").host("localhost").port(getPort());
+ restConfiguration().component("netty-http").host("localhost").port(getPort());
from("direct:start")
.to("rest:get:users/basic/?id={id}");
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerPutTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerPutTest.java
similarity index 95%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerPutTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerPutTest.java
index 3f21007..90c129b 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerPutTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerPutTest.java
@@ -37,7 +37,7 @@ public class RestNettyProducerPutTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
// configure to use localhost with the given port
- restConfiguration().component("netty4-http").host("localhost").port(getPort());
+ restConfiguration().component("netty-http").host("localhost").port(getPort());
from("direct:start")
.to("rest:put:users/{id}");
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerThrowExceptionErrorTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerThrowExceptionErrorTest.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerThrowExceptionErrorTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerThrowExceptionErrorTest.java
index 009742b..2eb83fb 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerThrowExceptionErrorTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerThrowExceptionErrorTest.java
@@ -44,7 +44,7 @@ public class RestNettyProducerThrowExceptionErrorTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
// configure to use localhost with the given port
- restConfiguration().component("netty4-http").host("localhost").port(getPort())
+ restConfiguration().component("netty-http").host("localhost").port(getPort())
.endpointProperty("throwExceptionOnFailure", "false");
from("direct:start")
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerVerbUpperCaseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerVerbUpperCaseTest.java
similarity index 96%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerVerbUpperCaseTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerVerbUpperCaseTest.java
index fb31c07..12e4750 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerVerbUpperCaseTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerVerbUpperCaseTest.java
@@ -37,7 +37,7 @@ public class RestNettyProducerVerbUpperCaseTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
// configure to use netty on localhost with the given port
- restConfiguration().component("netty4-http").host("localhost").port(getPort());
+ restConfiguration().component("netty-http").host("localhost").port(getPort());
from("direct:start")
.to("rest:get:users/{id}/basic");
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestPathMatchingTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestPathMatchingTest.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestPathMatchingTest.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/RestPathMatchingTest.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserJaxbPojo.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserJaxbPojo.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserJaxbPojo.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserJaxbPojo.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserPojo.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserPojo.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserPojo.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserPojo.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserPojoEx.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserPojoEx.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserPojoEx.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserPojoEx.java
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserService.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserService.java
similarity index 100%
rename from components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserService.java
rename to components/camel-netty-http/src/test/java/org/apache/camel/component/netty4/http/rest/UserService.java
diff --git a/components/camel-netty4-http/src/test/resources/jsse/client-keystore.jks b/components/camel-netty-http/src/test/resources/jsse/client-keystore.jks
similarity index 100%
rename from components/camel-netty4-http/src/test/resources/jsse/client-keystore.jks
rename to components/camel-netty-http/src/test/resources/jsse/client-keystore.jks
diff --git a/components/camel-netty4-http/src/test/resources/jsse/client-truststore.jks b/components/camel-netty-http/src/test/resources/jsse/client-truststore.jks
similarity index 100%
rename from components/camel-netty4-http/src/test/resources/jsse/client-truststore.jks
rename to components/camel-netty-http/src/test/resources/jsse/client-truststore.jks
diff --git a/components/camel-netty4-http/src/test/resources/jsse/localhost.ks b/components/camel-netty-http/src/test/resources/jsse/localhost.ks
similarity index 100%
rename from components/camel-netty4-http/src/test/resources/jsse/localhost.ks
rename to components/camel-netty-http/src/test/resources/jsse/localhost.ks
diff --git a/components/camel-netty4-http/src/test/resources/jsse/server-keystore.jks b/components/camel-netty-http/src/test/resources/jsse/server-keystore.jks
similarity index 100%
rename from components/camel-netty4-http/src/test/resources/jsse/server-keystore.jks
rename to components/camel-netty-http/src/test/resources/jsse/server-keystore.jks
diff --git a/components/camel-netty4-http/src/test/resources/jsse/server-truststore.jks b/components/camel-netty-http/src/test/resources/jsse/server-truststore.jks
similarity index 100%
rename from components/camel-netty4-http/src/test/resources/jsse/server-truststore.jks
rename to components/camel-netty-http/src/test/resources/jsse/server-truststore.jks
diff --git a/components/camel-netty4-http/src/test/resources/log4j2.properties b/components/camel-netty-http/src/test/resources/log4j2.properties
similarity index 96%
rename from components/camel-netty4-http/src/test/resources/log4j2.properties
rename to components/camel-netty-http/src/test/resources/log4j2.properties
index 5cdd399..b78e89c 100644
--- a/components/camel-netty4-http/src/test/resources/log4j2.properties
+++ b/components/camel-netty-http/src/test/resources/log4j2.properties
@@ -18,7 +18,7 @@
configuration.packages=org.apache.camel.component.netty4.http
appender.file.type = File
appender.file.name = file
-appender.file.fileName = target/camel-netty4-http-test.log
+appender.file.fileName = target/camel-netty-http-test.log
appender.file.layout.type = PatternLayout
appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
appender.out.type = Console
diff --git a/components/camel-netty4-http/src/test/resources/myjaas.config b/components/camel-netty-http/src/test/resources/myjaas.config
similarity index 100%
rename from components/camel-netty4-http/src/test/resources/myjaas.config
rename to components/camel-netty-http/src/test/resources/myjaas.config
diff --git a/components/camel-netty4-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml b/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml
similarity index 92%
rename from components/camel-netty4-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml
rename to components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml
index 801ef31..eec97c1 100644
--- a/components/camel-netty4-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml
+++ b/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml
@@ -57,7 +57,7 @@
</bean>
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
- <endpoint id="input1" uri="netty4-http:http://0.0.0.0:#{dynaPort}/foo?matchOnUriPrefix=true&securityConfiguration.realm=karaf&securityConfiguration.securityConstraint=#constraint"/>
+ <endpoint id="input1" uri="netty-http:http://0.0.0.0:#{dynaPort}/foo?matchOnUriPrefix=true&securityConfiguration.realm=karaf&securityConfiguration.securityConstraint=#constraint"/>
<route>
<from uri="ref:input1"/>
diff --git a/components/camel-netty4-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml b/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml
similarity index 95%
rename from components/camel-netty4-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml
rename to components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml
index 464fbf9..a62abb4 100644
--- a/components/camel-netty4-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml
+++ b/components/camel-netty-http/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml
@@ -49,7 +49,7 @@
</camel:sslContextParameters>
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
- <endpoint id="input1" uri="netty4-http:https://0.0.0.0:#{dynaPort}?ssl=true&sslContextParameters=#mySsl"/>
+ <endpoint id="input1" uri="netty-http:https://0.0.0.0:#{dynaPort}?ssl=true&sslContextParameters=#mySsl"/>
<route>
<from uri="ref:input1"/>
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
index ad50717..0b2a837 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
@@ -38,7 +38,7 @@ public interface NettyHttpEndpointBuilderFactory {
/**
- * Builder for endpoint consumers for the Netty4 HTTP component.
+ * Builder for endpoint consumers for the Netty HTTP component.
*/
public interface NettyHttpEndpointConsumerBuilder
extends
@@ -760,7 +760,7 @@ public interface NettyHttpEndpointBuilderFactory {
}
/**
- * Advanced builder for endpoint consumers for the Netty4 HTTP component.
+ * Advanced builder for endpoint consumers for the Netty HTTP component.
*/
public interface AdvancedNettyHttpEndpointConsumerBuilder
extends
@@ -1873,7 +1873,7 @@ public interface NettyHttpEndpointBuilderFactory {
}
/**
- * Builder for endpoint producers for the Netty4 HTTP component.
+ * Builder for endpoint producers for the Netty HTTP component.
*/
public interface NettyHttpEndpointProducerBuilder
extends
@@ -2570,7 +2570,7 @@ public interface NettyHttpEndpointBuilderFactory {
}
/**
- * Advanced builder for endpoint producers for the Netty4 HTTP component.
+ * Advanced builder for endpoint producers for the Netty HTTP component.
*/
public interface AdvancedNettyHttpEndpointProducerBuilder
extends
@@ -3373,7 +3373,7 @@ public interface NettyHttpEndpointBuilderFactory {
}
/**
- * Builder for endpoint for the Netty4 HTTP component.
+ * Builder for endpoint for the Netty HTTP component.
*/
public interface NettyHttpEndpointBuilder
extends
@@ -3910,7 +3910,7 @@ public interface NettyHttpEndpointBuilderFactory {
}
/**
- * Advanced builder for endpoint for the Netty4 HTTP component.
+ * Advanced builder for endpoint for the Netty HTTP component.
*/
public interface AdvancedNettyHttpEndpointBuilder
extends
@@ -4465,12 +4465,12 @@ public interface NettyHttpEndpointBuilderFactory {
}
}
/**
- * Netty4 HTTP (camel-netty4-http)
+ * Netty HTTP (camel-netty-http)
* Netty HTTP server and client using the Netty 4.x library.
*
* Category: http
* Available as of version: 2.14
- * Maven coordinates: org.apache.camel:camel-netty4-http
+ * Maven coordinates: org.apache.camel:camel-netty-http
*
* Syntax: <code>netty-http:protocol:host:port/path</code>
*
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml b/platforms/spring-boot/components-starter/camel-netty-http-starter/pom.xml
similarity index 79%
rename from platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml
rename to platforms/spring-boot/components-starter/camel-netty-http-starter/pom.xml
index 39eb572..9b834c8 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-netty-http-starter/pom.xml
@@ -24,10 +24,10 @@
<artifactId>components-starter</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-netty4-http-starter</artifactId>
+ <artifactId>camel-netty-http-starter</artifactId>
<packaging>jar</packaging>
- <name>Spring-Boot Starter :: Camel :: Netty4 HTTP</name>
- <description>Spring-Boot Starter for Camel Netty4 HTTP support</description>
+ <name>Spring-Boot Starter :: Camel :: Netty HTTP</name>
+ <description>Spring-Boot Starter for Camel Netty HTTP support</description>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -36,17 +36,9 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-http</artifactId>
+ <artifactId>camel-netty-http</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http-starter</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- End of test dependencies -->
<!--START OF GENERATED CODE-->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java
similarity index 95%
rename from platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java
index e28fcd3..38542e8 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java
@@ -70,12 +70,12 @@ public class NettyHttpComponentAutoConfiguration {
static class GroupConditions extends GroupCondition {
public GroupConditions() {
- super("camel.component", "camel.component.netty4-http");
+ super("camel.component", "camel.component.netty-http");
}
}
@Lazy
- @Bean({"netty-http-component", "netty4-http-component"})
+ @Bean(name = "netty-http-component")
@ConditionalOnMissingBean(NettyHttpComponent.class)
public NettyHttpComponent configureNettyHttpComponent() throws Exception {
NettyHttpComponent component = new NettyHttpComponent();
@@ -110,12 +110,12 @@ public class NettyHttpComponentAutoConfiguration {
? HierarchicalPropertiesEvaluator.evaluate(
applicationContext.getEnvironment(),
"camel.component.customizer",
- "camel.component.netty4-http.customizer",
+ "camel.component.netty-http.customizer",
((HasId) customizer).getId())
: HierarchicalPropertiesEvaluator.evaluate(
applicationContext.getEnvironment(),
"camel.component.customizer",
- "camel.component.netty4-http.customizer");
+ "camel.component.netty-http.customizer");
if (useCustomizer) {
LOGGER.debug("Configure component {}, with customizer {}",
component, customizer);
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java
similarity index 99%
rename from platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java
rename to platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java
index 70f5bee..573569c 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java
@@ -29,14 +29,14 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.netty4-http")
+@ConfigurationProperties(prefix = "camel.component.netty-http")
public class NettyHttpComponentConfiguration
extends
ComponentConfigurationPropertiesCommon {
/**
- * Whether to enable auto configuration of the netty4-http component. This
- * is enabled by default.
+ * Whether to enable auto configuration of the netty-http component. This is
+ * enabled by default.
*/
private Boolean enabled;
/**
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/LICENSE.txt
rename to platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/resources/META-INF/LICENSE.txt
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/NOTICE.txt
rename to platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/resources/META-INF/NOTICE.txt
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/resources/META-INF/spring.factories
similarity index 99%
rename from platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/spring.factories
rename to platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/resources/META-INF/spring.factories
index 01fafce..fbf34a4 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/resources/META-INF/spring.factories
@@ -14,5 +14,6 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
+
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.netty4.http.springboot.NettyHttpComponentAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/resources/META-INF/spring.provides
similarity index 97%
rename from platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/spring.provides
rename to platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/resources/META-INF/spring.provides
index 9f7b83a..1e1ad8b 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/spring.provides
+++ b/platforms/spring-boot/components-starter/camel-netty-http-starter/src/main/resources/META-INF/spring.provides
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-provides: camel-netty4-http
+provides: camel-netty-http
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 5dd8031..0000000
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "properties": [
- {
- "defaultValue": true,
- "name": "camel.component.netty4-http.enabled",
- "description": "Enable netty4-http component",
- "type": "java.lang.Boolean"
- }
- ]
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpAutoConfigurationTest.java b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpAutoConfigurationTest.java
deleted file mode 100644
index 75db04b..0000000
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpAutoConfigurationTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.netty4.http.springboot;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.apache.camel.component.netty4.http.springboot.Netty4StarterTestHelper.getPort;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Testing the servlet mapping
- */
-@RunWith(SpringRunner.class)
-@DirtiesContext
-@SpringBootApplication
-@SpringBootTest(
- classes = {
- Netty4HttpAutoConfigurationTest.TestConfiguration.class
- },
- properties = {
- "camel.component.netty4-http.configuration.compression=true"
-})
-public class Netty4HttpAutoConfigurationTest {
-
- @Autowired
- private ProducerTemplate producerTemplate;
-
- @Test
- public void testEndpoint() throws Exception {
- String result = producerTemplate.requestBody("netty4-http:http://localhost:" + getPort(), null, String.class);
- assertEquals("Hello", result);
- }
-
- @Test
- public void testConfigOverride() throws Exception {
- Exchange exchange = producerTemplate.request("netty4-http:http://localhost:" + getPort(), x -> x.getIn().setHeader("Accept-Encoding", "gzip"));
- Assert.assertEquals("gzip", exchange.getOut().getHeader("Content-Encoding"));
- }
-
- @Component
- public static class TestRoutes extends RouteBuilder {
- @Override
- public void configure() throws Exception {
- from("netty4-http:http://localhost:" + getPort())
- .transform().constant("Hello");
- }
- }
-
- @Configuration
- public static class TestConfiguration {
- }
-}
-
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java
deleted file mode 100644
index 6a0f283..0000000
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.netty4.http.springboot;
-
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.apache.camel.component.netty4.http.springboot.Netty4StarterTestHelper.getPort;
-
-/**
- * Testing the ssl configuration
- */
-@RunWith(SpringRunner.class)
-@DirtiesContext
-@SpringBootApplication
-@SpringBootTest(
- classes = {
- Netty4HttpSSLTest.TestConfiguration.class
- },
- properties = {
- "camel.ssl.config.cert-alias=web",
- "camel.ssl.config.key-managers.key-password=changeit",
- "camel.ssl.config.key-managers.key-store.resource=/keystore.p12",
- "camel.ssl.config.key-managers.key-store.password=changeit",
- "camel.ssl.config.key-managers.key-store.type=PKCS12",
- "camel.ssl.config.trust-managers.key-store.resource=/cacerts",
- "camel.ssl.config.trust-managers.key-store.password=changeit",
- "camel.ssl.config.trust-managers.key-store.type=jks",
- "camel.component.netty4-http.use-global-ssl-context-parameters=true",
- "camel.component.http.use-global-ssl-context-parameters=true"
-})
-@Ignore("Bug in https4 spring-boot configuration")
-public class Netty4HttpSSLTest {
- @Autowired
- private ProducerTemplate producerTemplate;
-
- @Test
- public void testEndpoint() throws Exception {
- String result = producerTemplate.requestBody("https4://localhost:" + getPort(), null, String.class);
- Assert.assertEquals("Hello", result);
- }
-
- @Component
- public static class TestRoutes extends RouteBuilder {
- @Override
- public void configure() throws Exception {
- from("netty4-http:https://localhost:" + getPort() + "?ssl=true")
- .transform().constant("Hello");
- }
- }
-
- @Configuration
- public static class TestConfiguration {
- }
-}
-
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4StarterTestHelper.java b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4StarterTestHelper.java
deleted file mode 100644
index 2c7bac7..0000000
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4StarterTestHelper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.netty4.http.springboot;
-
-import java.io.File;
-import java.io.FileOutputStream;
-
-import org.apache.camel.converter.IOConverter;
-import org.apache.camel.test.AvailablePortFinder;
-
-public final class Netty4StarterTestHelper {
-
- private static volatile int port = -1;
-
- private Netty4StarterTestHelper() {
- }
-
- private static void initPort() throws Exception {
- if (port <= 0) {
- File file = new File("target/nettyport.txt");
-
- if (!file.exists()) {
- // start from somewhere in the 26xxx range
- port = AvailablePortFinder.getNextAvailable(26000);
- } else {
- // read port number from file
- String s = IOConverter.toString(file, null);
- port = Integer.parseInt(s);
- // use next free port
- port = AvailablePortFinder.getNextAvailable(port + 1);
- }
-
- // save to file, do not append
- try (FileOutputStream fos = new FileOutputStream(file, false)) {
- fos.write(String.valueOf(port).getBytes());
- }
- }
- }
-
- public static int getPort() {
- try {
- initPort();
- } catch (Exception e) {
- throw new IllegalStateException(e);
- }
- return port;
- }
-}
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/application.properties b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/application.properties
deleted file mode 100644
index 71e1678..0000000
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/application.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-spring.main.banner-mode=off
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/cacerts b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/cacerts
deleted file mode 100644
index 902dc68..0000000
Binary files a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/cacerts and /dev/null differ
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/keystore.p12 b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/keystore.p12
deleted file mode 100644
index 677bae9..0000000
Binary files a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/keystore.p12 and /dev/null differ
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/logback.xml b/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/logback.xml
deleted file mode 100644
index 577c0a4..0000000
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- <file>target/camel-netty4-http-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 37356c9..c72e536 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -281,6 +281,7 @@
<module>camel-mybatis-starter</module>
<module>camel-nagios-starter</module>
<module>camel-nats-starter</module>
+ <module>camel-netty-http-starter</module>
<module>camel-netty-starter</module>
<module>camel-netty4-http-starter</module>
<module>camel-nsq-starter</module>