You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2019/08/12 23:22:43 UTC
[camel] branch master updated (1b81a90 -> d17bdf2)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1b81a90 Fix typo
new 74fab44 cleanups for camel-http4 to camel-http component renaming
new d17bdf2 update migration guide and correct typos
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MIGRATION.md | 4 +-
README.md | 1 -
.../org/apache/camel/catalog/CamelCatalogTest.java | 4 +-
.../camel/http/common/HttpSendDynamicAware.java | 2 +-
.../camel-http/src/main/docs/http-component.adoc | 16 ++--
.../BasicAuthenticationHttpClientConfigurer.java | 4 +-
.../{http4 => http}/CompositeHttpConfigurer.java | 2 +-
.../{http4 => http}/HttpClientConfigurer.java | 2 +-
.../component/{http4 => http}/HttpComponent.java | 36 ++++----
.../HttpComponentVerifierExtension.java | 2 +-
.../component/{http4 => http}/HttpConstants.java | 2 +-
.../{http4 => http}/HttpDeleteWithBodyMethod.java | 2 +-
.../component/{http4 => http}/HttpEndpoint.java | 2 +-
.../{http4 => http}/HttpEntityConverter.java | 2 +-
.../component/{http4 => http}/HttpMethods.java | 4 +-
.../{http4 => http}/HttpPollingConsumer.java | 14 ++--
.../component/{http4 => http}/HttpProducer.java | 10 +--
.../{http4 => http}/HttpSendDynamicAware.java | 2 +-
.../camel/component/{http4 => http}/HttpUtil.java | 2 +-
.../component/{http4 => http}/NoopCookieStore.java | 2 +-
.../{http4 => http}/PreemptiveAuthInterceptor.java | 4 +-
.../{http4 => http}/ProxyHttpClientConfigurer.java | 4 +-
.../cloud/HttpServiceExpression.java} | 8 +-
.../cloud/HttpServiceExpressionFactory.java} | 6 +-
.../{http4 => http}/helper/HttpMethodHelper.java | 8 +-
.../camel/component/{http4 => http}/package.html | 0
.../component/http4/HttpMethodsConverter.java | 40 ---------
.../component/{http4 => http}/BaseHttpTest.java | 4 +-
.../component/{http4 => http}/BaseHttpsTest.java | 4 +-
.../CamelComponentVerifierExtensionTest.java | 8 +-
.../CamelComponentVerifierTest.java | 8 +-
.../{http4 => http}/GoogleUrlRewrite.java | 2 +-
.../{http4 => http}/HeaderFilteringTest.java | 2 +-
.../{http4 => http}/HttpAuthenticationTest.java | 22 ++---
.../component/{http4 => http}/HttpBodyTest.java | 18 ++--
.../HttpBodyWithOtherProtocalNameTest.java | 6 +-
.../{http4 => http}/HttpBridgeEndpointTest.java | 12 +--
.../HttpCamelHeadersNotCopiedTest.java | 4 +-
.../{http4 => http}/HttpCamelHeadersTest.java | 4 +-
.../component/{http4 => http}/HttpCharsetTest.java | 10 +--
.../{http4 => http}/HttpClientConfigurerTest.java | 4 +-
.../{http4 => http}/HttpCompressionTest.java | 10 +--
.../{http4 => http}/HttpConcurrentTest.java | 4 +-
.../HttpCustomComponentNameTest.java | 2 +-
.../{http4 => http}/HttpDefaultPortNumberTest.java | 10 +--
.../HttpDisableStreamCacheTest.java | 10 +--
.../HttpEndpointOptionsNotChangeComponentTest.java | 6 +-
.../{http4 => http}/HttpEndpointURLTest.java | 14 ++--
.../HttpInvalidConfigurationTest.java | 6 +-
.../HttpInvalidHttpClientConfigurationTest.java | 6 +-
.../component/{http4 => http}/HttpMethodsTest.java | 14 ++--
.../{http4 => http}/HttpNoCamelHeaderTest.java | 2 +-
.../HttpNoConnectionRedeliveryTest.java | 10 +--
.../{http4 => http}/HttpNoConnectionTest.java | 8 +-
.../component/{http4 => http}/HttpPathTest.java | 10 +--
.../{http4 => http}/HttpPollingConsumerTest.java | 26 +++---
.../HttpProducerConnectionCloseTest.java | 14 ++--
.../HttpProducerContentLengthTest.java | 34 ++++----
.../HttpProducerContentTypeTest.java | 22 ++---
.../HttpProducerContentTypeWithSemiColomnTest.java | 22 ++---
.../HttpProducerExplicitConnectionCloseTest.java | 12 +--
.../HttpProducerSelectMethodTest.java | 18 ++--
.../{http4 => http}/HttpProducerSessionTest.java | 10 +--
.../HttpProducerTwoHeadersWithSameKeyTest.java | 6 +-
.../HttpProducerTwoParametersWithSameKeyTest.java | 6 +-
.../HttpProducerWithSystemPropertiesTest.java | 4 +-
.../{http4 => http}/HttpProxyServerTest.java | 6 +-
.../component/{http4 => http}/HttpQueryTest.java | 14 ++--
.../{http4 => http}/HttpRedirectTest.java | 8 +-
.../HttpReferenceParameterTest.java | 8 +-
.../{http4 => http}/HttpSNIHostNameTest.java | 4 +-
.../{http4 => http}/HttpSOTimeoutTest.java | 10 +--
.../{http4 => http}/HttpSendDynamicAwareTest.java | 6 +-
.../{http4 => http}/HttpServerTestSupport.java | 4 +-
.../HttpThrowExceptionOnFailureTest.java | 18 ++--
.../{http4 => http}/HttpWithHttpUriHeaderTest.java | 10 +--
.../{http4 => http}/HttpsAuthenticationTest.java | 14 ++--
.../component/{http4 => http}/HttpsGetTest.java | 10 +--
.../{http4 => http}/HttpsServerTestSupport.java | 3 +-
.../HttpsSslContextParametersGetTest.java | 8 +-
...psTwoComponentsSslContextParametersGetTest.java | 14 ++--
...tpsTwoDifferentSslContextParametersGetTest.java | 12 +--
.../ManagedHttpProducerPoolStatsTest.java | 4 +-
.../component/{http4 => http}/UrlRewriteTest.java | 2 +-
.../handler/AuthenticationValidationHandler.java | 4 +-
.../handler/BasicRawQueryValidationHandler.java | 2 +-
.../handler/BasicValidationHandler.java | 4 +-
.../handler/DelayValidationHandler.java | 4 +-
.../handler/DrinkValidationHandler.java | 2 +-
.../handler/HeaderValidationHandler.java | 4 +-
.../ProxyAuthenticationValidationHandler.java | 4 +-
.../handler/SessionReflectionHandler.java | 2 +-
.../{http4 => http}/helper/HttpHelperTest.java | 6 +-
.../rest/RestCamelComponentVerifierTest.java | 8 +-
.../http4/AdviceAndInterceptHttp4IssueTest.java | 95 ----------------------
.../src/test/resources/log4j2.properties | 2 +-
.../{http4 => http}/CamelHttp4Context.xml | 6 +-
.../camel-jetty/src/main/docs/jetty-component.adoc | 6 +-
.../jetty/HttpAuthMethodPriorityTest.java | 2 +-
.../HttpBasicAuthComponentConfiguredTest.java | 2 +-
...gMapHttpMessageFormUrlEncodedFalseBodyTest.java | 8 +-
...pBindingPreservePostFormUrlEncodedBodyTest.java | 10 +--
.../jetty/HttpBridgeMultipartRouteTest.java | 22 ++---
...thBodyTest.java => HttpDeleteWithBodyTest.java} | 6 +-
.../component/jetty/HttpGZipEncodingTest.java | 2 +-
.../component/jetty/MultiThreadedHttpGetTest.java | 6 +-
.../component/jetty/javabody/HttpJavaBodyTest.java | 2 +-
.../rest/producer/Http4RestProducerGetTest.java | 60 --------------
.../rest/producer/Http4RestProducerPutTest.java | 53 ------------
...pBindingPreservePostFormUrlEncodedBodyTest.java | 2 +-
.../http/NettyHttpBindingUseAbsolutePathTest.java | 2 +-
.../NettyHttpBindingUseRelativePathInPostTest.java | 2 +-
.../http/NettyHttpBindingUseRelativePathTest.java | 2 +-
.../src/main/docs/properties-component.adoc | 3 +-
.../component/restlet/RestRestletRouterIdTest.java | 2 +-
.../PreservePostFormUrlEncodedBodyTest.java | 10 +--
.../apache/camel/language/simple/SimpleTest.java | 2 +-
.../endpoint/dsl/HttpEndpointBuilderFactory.java | 4 +-
.../modules/ROOT/pages/http-component.adoc | 16 ++--
.../modules/ROOT/pages/jetty-component.adoc | 6 +-
.../modules/ROOT/pages/properties-component.adoc | 6 +-
.../modules/ROOT/pages/http-session-handling.adoc | 2 +-
.../modules/ROOT/pages/http-session.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/karaf.adoc | 1 -
.../springboot/HttpComponentAutoConfiguration.java | 4 +-
.../springboot/HttpComponentConfiguration.java | 4 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../apache/camel/itest/http/Http4EndpointTest.java | 82 -------------------
.../itest/http/Http4MaxConnectionPerHostTest.java | 81 ------------------
.../apache/camel/itest/http/Http4RouteTest.java | 89 --------------------
.../apache/camel/itest/http/HttpEndpointTest.java | 39 ++++++++-
.../itest/http/HttpMaxConnectionPerHostTest.java | 40 +++++++--
.../jetty/JettyBridgeHostHeaderIssueTest.java | 2 +-
.../camel/itest/http/Http4EndpointTest-context.xml | 2 +-
.../http/Http4MaxConnectionPerHostTest-context.xml | 2 +-
135 files changed, 513 insertions(+), 952 deletions(-)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/BasicAuthenticationHttpClientConfigurer.java (98%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/CompositeHttpConfigurer.java (98%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpClientConfigurer.java (96%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpComponent.java (99%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpComponentVerifierExtension.java (99%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpConstants.java (96%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpDeleteWithBodyMethod.java (96%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpEndpoint.java (99%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpEntityConverter.java (99%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpMethods.java (98%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpPollingConsumer.java (98%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpProducer.java (99%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpSendDynamicAware.java (95%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/HttpUtil.java (96%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/NoopCookieStore.java (97%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/PreemptiveAuthInterceptor.java (98%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/ProxyHttpClientConfigurer.java (98%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4/cloud/Http4ServiceExpression.java => http/cloud/HttpServiceExpression.java} (80%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4/cloud/Http4ServiceExpressionFactory.java => http/cloud/HttpServiceExpressionFactory.java} (87%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/helper/HttpMethodHelper.java (94%)
rename components/camel-http/src/main/java/org/apache/camel/component/{http4 => http}/package.html (100%)
delete mode 100644 components/camel-http/src/main/java/org/apache/camel/component/http4/HttpMethodsConverter.java
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/BaseHttpTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/BaseHttpsTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/CamelComponentVerifierExtensionTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/CamelComponentVerifierTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/GoogleUrlRewrite.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HeaderFilteringTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpAuthenticationTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpBodyTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpBodyWithOtherProtocalNameTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpBridgeEndpointTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpCamelHeadersNotCopiedTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpCamelHeadersTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpCharsetTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpClientConfigurerTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpCompressionTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpConcurrentTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpCustomComponentNameTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpDefaultPortNumberTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpDisableStreamCacheTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpEndpointOptionsNotChangeComponentTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpEndpointURLTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpInvalidConfigurationTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpInvalidHttpClientConfigurationTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpMethodsTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpNoCamelHeaderTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpNoConnectionRedeliveryTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpNoConnectionTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpPathTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpPollingConsumerTest.java (91%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerConnectionCloseTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerContentLengthTest.java (94%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerContentTypeTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerContentTypeWithSemiColomnTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerExplicitConnectionCloseTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerSelectMethodTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerSessionTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerTwoHeadersWithSameKeyTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerTwoParametersWithSameKeyTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProducerWithSystemPropertiesTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpProxyServerTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpQueryTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpRedirectTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpReferenceParameterTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpSNIHostNameTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpSOTimeoutTest.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpSendDynamicAwareTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpServerTestSupport.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpThrowExceptionOnFailureTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpWithHttpUriHeaderTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsAuthenticationTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsGetTest.java (95%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsServerTestSupport.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsSslContextParametersGetTest.java (94%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsTwoComponentsSslContextParametersGetTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/HttpsTwoDifferentSslContextParametersGetTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/ManagedHttpProducerPoolStatsTest.java (99%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/UrlRewriteTest.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/AuthenticationValidationHandler.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/BasicRawQueryValidationHandler.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/BasicValidationHandler.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/DelayValidationHandler.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/DrinkValidationHandler.java (96%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/HeaderValidationHandler.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/ProxyAuthenticationValidationHandler.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/handler/SessionReflectionHandler.java (97%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/helper/HttpHelperTest.java (98%)
rename components/camel-http/src/test/java/org/apache/camel/component/{http4 => http}/rest/RestCamelComponentVerifierTest.java (97%)
delete mode 100644 components/camel-http/src/test/java/org/apache/camel/component/http4/AdviceAndInterceptHttp4IssueTest.java
rename components/camel-http/src/test/resources/org/apache/camel/component/{http4 => http}/CamelHttp4Context.xml (94%)
rename components/camel-jetty/src/test/java/org/apache/camel/component/jetty/{Http4DeleteWithBodyTest.java => HttpDeleteWithBodyTest.java} (91%)
delete mode 100644 components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerGetTest.java
delete mode 100644 components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerPutTest.java
rename platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/{http4 => http}/springboot/HttpComponentAutoConfiguration.java (98%)
rename platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/{http4 => http}/springboot/HttpComponentConfiguration.java (98%)
delete mode 100644 tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java
delete mode 100644 tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java
delete mode 100644 tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java
[camel] 02/02: update migration guide and correct typos
Posted by bv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d17bdf2fc70c71f7b8fab9c082699ec531f2f6c7
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Tue Aug 13 00:37:01 2019 +0200
update migration guide and correct typos
---
MIGRATION.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 6b12b45..a182b1e 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -104,7 +104,7 @@ The properties component will now use OS environment variables as preferred valu
### Removed components
-We have removed all deprecated components from Camel 2.x, also including the old `camel-http` component. `camel-http4` has been renamed to `camel-http`.
+We have removed all deprecated components from Camel 2.x, also including the old `camel-http` component. `camel-http4` has been renamed to `camel-http`, and it's corresponding component package from `org.apache.camel.component.http4` to `org.apache.camel.component.http`.
We removed `camel-jibx` component which wasn't working on JDK 8.
@@ -112,7 +112,7 @@ We removed `camel-boon` dataformat which wasn't working on JDK 9 and later.
The `camel-zookeeper` has its route policy functionality removed, instead use `ZooKeeperClusterService` or the `camel-zookeeper-master` component.
-The `camel-jetty` component no longer supports producer (eg to) which has been removed, instead use `camel-http4` component instead.
+The `camel-jetty` component no longer supports producer (eg to) which has been removed, use `camel-http` component instead.
The `twitter-streaming` component has been removed as it relied on the deprecated Twitter Streaming API and is no longer functional.
[camel] 01/02: cleanups for camel-http4 to camel-http component
renaming
Posted by bv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 74fab442e942532cefda1d53d70ec61516ccf881
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Tue Aug 13 00:01:43 2019 +0200
cleanups for camel-http4 to camel-http component renaming
---
README.md | 1 -
.../org/apache/camel/catalog/CamelCatalogTest.java | 4 +-
.../camel/http/common/HttpSendDynamicAware.java | 2 +-
.../camel-http/src/main/docs/http-component.adoc | 16 ++--
.../BasicAuthenticationHttpClientConfigurer.java | 4 +-
.../{http4 => http}/CompositeHttpConfigurer.java | 2 +-
.../{http4 => http}/HttpClientConfigurer.java | 2 +-
.../component/{http4 => http}/HttpComponent.java | 36 ++++----
.../HttpComponentVerifierExtension.java | 2 +-
.../component/{http4 => http}/HttpConstants.java | 2 +-
.../{http4 => http}/HttpDeleteWithBodyMethod.java | 2 +-
.../component/{http4 => http}/HttpEndpoint.java | 2 +-
.../{http4 => http}/HttpEntityConverter.java | 2 +-
.../component/{http4 => http}/HttpMethods.java | 4 +-
.../{http4 => http}/HttpPollingConsumer.java | 14 ++--
.../component/{http4 => http}/HttpProducer.java | 10 +--
.../{http4 => http}/HttpSendDynamicAware.java | 2 +-
.../camel/component/{http4 => http}/HttpUtil.java | 2 +-
.../component/{http4 => http}/NoopCookieStore.java | 2 +-
.../{http4 => http}/PreemptiveAuthInterceptor.java | 4 +-
.../{http4 => http}/ProxyHttpClientConfigurer.java | 4 +-
.../cloud/HttpServiceExpression.java} | 8 +-
.../cloud/HttpServiceExpressionFactory.java} | 6 +-
.../{http4 => http}/helper/HttpMethodHelper.java | 8 +-
.../camel/component/{http4 => http}/package.html | 0
.../component/http4/HttpMethodsConverter.java | 40 ---------
.../component/{http4 => http}/BaseHttpTest.java | 4 +-
.../component/{http4 => http}/BaseHttpsTest.java | 4 +-
.../CamelComponentVerifierExtensionTest.java | 8 +-
.../CamelComponentVerifierTest.java | 8 +-
.../{http4 => http}/GoogleUrlRewrite.java | 2 +-
.../{http4 => http}/HeaderFilteringTest.java | 2 +-
.../{http4 => http}/HttpAuthenticationTest.java | 22 ++---
.../component/{http4 => http}/HttpBodyTest.java | 18 ++--
.../HttpBodyWithOtherProtocalNameTest.java | 6 +-
.../{http4 => http}/HttpBridgeEndpointTest.java | 12 +--
.../HttpCamelHeadersNotCopiedTest.java | 4 +-
.../{http4 => http}/HttpCamelHeadersTest.java | 4 +-
.../component/{http4 => http}/HttpCharsetTest.java | 10 +--
.../{http4 => http}/HttpClientConfigurerTest.java | 4 +-
.../{http4 => http}/HttpCompressionTest.java | 10 +--
.../{http4 => http}/HttpConcurrentTest.java | 4 +-
.../HttpCustomComponentNameTest.java | 2 +-
.../{http4 => http}/HttpDefaultPortNumberTest.java | 10 +--
.../HttpDisableStreamCacheTest.java | 10 +--
.../HttpEndpointOptionsNotChangeComponentTest.java | 6 +-
.../{http4 => http}/HttpEndpointURLTest.java | 14 ++--
.../HttpInvalidConfigurationTest.java | 6 +-
.../HttpInvalidHttpClientConfigurationTest.java | 6 +-
.../component/{http4 => http}/HttpMethodsTest.java | 14 ++--
.../{http4 => http}/HttpNoCamelHeaderTest.java | 2 +-
.../HttpNoConnectionRedeliveryTest.java | 10 +--
.../{http4 => http}/HttpNoConnectionTest.java | 8 +-
.../component/{http4 => http}/HttpPathTest.java | 10 +--
.../{http4 => http}/HttpPollingConsumerTest.java | 26 +++---
.../HttpProducerConnectionCloseTest.java | 14 ++--
.../HttpProducerContentLengthTest.java | 34 ++++----
.../HttpProducerContentTypeTest.java | 22 ++---
.../HttpProducerContentTypeWithSemiColomnTest.java | 22 ++---
.../HttpProducerExplicitConnectionCloseTest.java | 12 +--
.../HttpProducerSelectMethodTest.java | 18 ++--
.../{http4 => http}/HttpProducerSessionTest.java | 10 +--
.../HttpProducerTwoHeadersWithSameKeyTest.java | 6 +-
.../HttpProducerTwoParametersWithSameKeyTest.java | 6 +-
.../HttpProducerWithSystemPropertiesTest.java | 4 +-
.../{http4 => http}/HttpProxyServerTest.java | 6 +-
.../component/{http4 => http}/HttpQueryTest.java | 14 ++--
.../{http4 => http}/HttpRedirectTest.java | 8 +-
.../HttpReferenceParameterTest.java | 8 +-
.../{http4 => http}/HttpSNIHostNameTest.java | 4 +-
.../{http4 => http}/HttpSOTimeoutTest.java | 10 +--
.../{http4 => http}/HttpSendDynamicAwareTest.java | 6 +-
.../{http4 => http}/HttpServerTestSupport.java | 4 +-
.../HttpThrowExceptionOnFailureTest.java | 18 ++--
.../{http4 => http}/HttpWithHttpUriHeaderTest.java | 10 +--
.../{http4 => http}/HttpsAuthenticationTest.java | 14 ++--
.../component/{http4 => http}/HttpsGetTest.java | 10 +--
.../{http4 => http}/HttpsServerTestSupport.java | 3 +-
.../HttpsSslContextParametersGetTest.java | 8 +-
...psTwoComponentsSslContextParametersGetTest.java | 14 ++--
...tpsTwoDifferentSslContextParametersGetTest.java | 12 +--
.../ManagedHttpProducerPoolStatsTest.java | 4 +-
.../component/{http4 => http}/UrlRewriteTest.java | 2 +-
.../handler/AuthenticationValidationHandler.java | 4 +-
.../handler/BasicRawQueryValidationHandler.java | 2 +-
.../handler/BasicValidationHandler.java | 4 +-
.../handler/DelayValidationHandler.java | 4 +-
.../handler/DrinkValidationHandler.java | 2 +-
.../handler/HeaderValidationHandler.java | 4 +-
.../ProxyAuthenticationValidationHandler.java | 4 +-
.../handler/SessionReflectionHandler.java | 2 +-
.../{http4 => http}/helper/HttpHelperTest.java | 6 +-
.../rest/RestCamelComponentVerifierTest.java | 8 +-
.../http4/AdviceAndInterceptHttp4IssueTest.java | 95 ----------------------
.../src/test/resources/log4j2.properties | 2 +-
.../{http4 => http}/CamelHttp4Context.xml | 6 +-
.../camel-jetty/src/main/docs/jetty-component.adoc | 6 +-
.../jetty/HttpAuthMethodPriorityTest.java | 2 +-
.../HttpBasicAuthComponentConfiguredTest.java | 2 +-
...gMapHttpMessageFormUrlEncodedFalseBodyTest.java | 8 +-
...pBindingPreservePostFormUrlEncodedBodyTest.java | 10 +--
.../jetty/HttpBridgeMultipartRouteTest.java | 22 ++---
...thBodyTest.java => HttpDeleteWithBodyTest.java} | 6 +-
.../component/jetty/HttpGZipEncodingTest.java | 2 +-
.../component/jetty/MultiThreadedHttpGetTest.java | 6 +-
.../component/jetty/javabody/HttpJavaBodyTest.java | 2 +-
.../rest/producer/Http4RestProducerGetTest.java | 60 --------------
.../rest/producer/Http4RestProducerPutTest.java | 53 ------------
...pBindingPreservePostFormUrlEncodedBodyTest.java | 2 +-
.../http/NettyHttpBindingUseAbsolutePathTest.java | 2 +-
.../NettyHttpBindingUseRelativePathInPostTest.java | 2 +-
.../http/NettyHttpBindingUseRelativePathTest.java | 2 +-
.../src/main/docs/properties-component.adoc | 3 +-
.../component/restlet/RestRestletRouterIdTest.java | 2 +-
.../PreservePostFormUrlEncodedBodyTest.java | 10 +--
.../apache/camel/language/simple/SimpleTest.java | 2 +-
.../endpoint/dsl/HttpEndpointBuilderFactory.java | 4 +-
.../modules/ROOT/pages/http-component.adoc | 16 ++--
.../modules/ROOT/pages/jetty-component.adoc | 6 +-
.../modules/ROOT/pages/properties-component.adoc | 6 +-
.../modules/ROOT/pages/http-session-handling.adoc | 2 +-
.../modules/ROOT/pages/http-session.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/karaf.adoc | 1 -
.../springboot/HttpComponentAutoConfiguration.java | 4 +-
.../springboot/HttpComponentConfiguration.java | 4 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../apache/camel/itest/http/Http4EndpointTest.java | 82 -------------------
.../itest/http/Http4MaxConnectionPerHostTest.java | 81 ------------------
.../apache/camel/itest/http/Http4RouteTest.java | 89 --------------------
.../apache/camel/itest/http/HttpEndpointTest.java | 39 ++++++++-
.../itest/http/HttpMaxConnectionPerHostTest.java | 40 +++++++--
.../jetty/JettyBridgeHostHeaderIssueTest.java | 2 +-
.../camel/itest/http/Http4EndpointTest-context.xml | 2 +-
.../http/Http4MaxConnectionPerHostTest-context.xml | 2 +-
134 files changed, 511 insertions(+), 950 deletions(-)
diff --git a/README.md b/README.md
index c9e9d7f..9a5c33f 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,6 @@ software:
* **camel-cxf** can be configured for secure communications
* **camel-ftp** can be configured for secure communications
* **camel-http** can be configured to use https
-* **camel-http** can be configured to use https
* **camel-infinispan** can be configured for secure communications
* **camel-jasypt** can be used for secure communications
* **camel-jetty** can be configured to use https
diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index a86bc93..7029e6e 100644
--- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -335,7 +335,7 @@ public class CamelCatalogTest {
}
@Test
- public void testNetty4Http4DynamicToIssueHost() throws Exception {
+ public void testNettyHttpDynamicToIssueHost() throws Exception {
String uri = "netty-http:http://a-b-c.hostname.tld:8080/anything";
Map<String, String> params = catalog.endpointProperties(uri);
assertEquals("http", params.get("protocol"));
@@ -1219,7 +1219,7 @@ public class CamelCatalogTest {
}
@Test
- public void testNetty4Http4DynamicToIssue() throws Exception {
+ public void testNettyHttpDynamicToIssue() throws Exception {
String uri = "netty-http:http://10.192.1.10:8080/client/alerts/summary?throwExceptionOnFailure=false";
Map<String, String> params = catalog.endpointProperties(uri);
params.remove("path");
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 929964a..85d83d1 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
@@ -116,7 +116,7 @@ public class HttpSendDynamicAware implements SendDynamicAware {
protected String[] parseUri(DynamicAwareEntry entry) {
String u = entry.getUri();
- // remove scheme prefix (unless its camel-http or camel-http4)
+ // remove scheme prefix (unless its camel-http or camel-http)
boolean httpComponent = "http".equals(scheme) || "https".equals(scheme);
if (!httpComponent) {
String prefix = scheme + "://";
diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc
index ea7ae44..809cedb 100644
--- a/components/camel-http/src/main/docs/http-component.adoc
+++ b/components/camel-http/src/main/docs/http-component.adoc
@@ -195,7 +195,7 @@ The component supports 20 options, which are listed below.
| *camel.component.http.enabled* | Whether to enable auto configuration of the http component. This is enabled by default. | | Boolean
| *camel.component.http.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String
| *camel.component.http.http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.http.common.HttpBinding type. | | String
-| *camel.component.http.http-client-configurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. The option is a org.apache.camel.component.http4.HttpClientConfigurer type. | | String
+| *camel.component.http.http-client-configurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. The option is a org.apache.camel.component.http.HttpClientConfigurer type. | | String
| *camel.component.http.http-configuration* | To use the shared HttpConfiguration as base configuration. The option is a org.apache.camel.http.common.HttpConfiguration type. | | String
| *camel.component.http.http-context* | To use a custom org.apache.http.protocol.HttpContext when executing requests. The option is a org.apache.http.protocol.HttpContext type. | | String
| *camel.component.http.max-total-connections* | The maximum number of connections. | 200 | Integer
@@ -252,7 +252,7 @@ body. All headers from the IN message will be copied to the OUT message,
so headers are preserved during routing. Additionally Camel will add the
HTTP response headers as well to the OUT message headers.
-
+
== Using System Properties
@@ -396,7 +396,7 @@ setting the message header. Here is an example:
[source,java]
-----------------------------------------------------------------------------------------------
from("direct:start")
- .setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http4.HttpMethods.POST))
+ .setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http.HttpMethods.POST))
.to("http://www.google.com")
.to("mock:results");
-----------------------------------------------------------------------------------------------
@@ -427,7 +427,7 @@ And the equivalent Spring sample:
== Using client timeout - SO_TIMEOUT
See the
-https://github.com/apache/camel/blob/master/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java[HttpSOTimeoutTest]
+https://github.com/apache/camel/blob/master/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java[HttpSOTimeoutTest]
unit test.
== Configuring a Proxy
@@ -611,10 +611,10 @@ http://hc.apache.org/httpcomponents-client-ga/[Apache HttpClient].
Please refer to
http://hc.apache.org/httpcomponents-client-ga/tutorial/html/connmgmt.html#d4e537[SSL/TLS
customization] for details or have a look into the
-`org.apache.camel.component.http4.HttpsServerTestSupport` unit test base
+`org.apache.camel.component.http.HttpsServerTestSupport` unit test base
class. +
You can also implement a custom
-`org.apache.camel.component.http4.HttpClientConfigurer` to do some
+`org.apache.camel.component.http.HttpClientConfigurer` to do some
configuration on the http client if you need full control of it.
However if you _just_ want to specify the keystore and truststore you
@@ -713,12 +713,12 @@ property.
[source,xml]
----------------------------------------------------------------------------
-<bean id="http-foo" class="org.apache.camel.component.http4.HttpComponent">
+<bean id="http-foo" class="org.apache.camel.component.http.HttpComponent">
<property name="sslContextParameters" ref="sslContextParams1"/>
<property name="x509HostnameVerifier" ref="hostnameVerifier"/>
</bean>
-<bean id="http-bar" class="org.apache.camel.component.http4.HttpComponent">
+<bean id="http-bar" class="org.apache.camel.component.http.HttpComponent">
<property name="sslContextParameters" ref="sslContextParams2"/>
<property name="x509HostnameVerifier" ref="hostnameVerifier"/>
</bean>
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/BasicAuthenticationHttpClientConfigurer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
similarity index 98%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/BasicAuthenticationHttpClientConfigurer.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
index 35051c1..0dbc867 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/BasicAuthenticationHttpClientConfigurer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/BasicAuthenticationHttpClientConfigurer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
@@ -49,4 +49,4 @@ public class BasicAuthenticationHttpClientConfigurer implements HttpClientConfig
clientBuilder.setDefaultCredentialsProvider(credentialsProvider);
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/CompositeHttpConfigurer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/CompositeHttpConfigurer.java
similarity index 98%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/CompositeHttpConfigurer.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/CompositeHttpConfigurer.java
index 554b491..c7fe370c 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/CompositeHttpConfigurer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/CompositeHttpConfigurer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.ArrayList;
import java.util.List;
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpClientConfigurer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpClientConfigurer.java
similarity index 96%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpClientConfigurer.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpClientConfigurer.java
index 212fc88..f2f01ca 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpClientConfigurer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpClientConfigurer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.http.impl.client.HttpClientBuilder;
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpComponent.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
similarity index 99%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpComponent.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
index 2c90ba9..c5f7518 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
import java.net.URI;
@@ -160,15 +160,15 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
if (authUsername != null && authPassword != null) {
String authDomain = getParameter(parameters, "authDomain", String.class);
String authHost = getParameter(parameters, "authHost", String.class);
-
+
return CompositeHttpConfigurer.combineConfigurers(configurer, new BasicAuthenticationHttpClientConfigurer(authUsername, authPassword, authDomain, authHost));
} else if (this.httpConfiguration != null) {
if ("basic".equalsIgnoreCase(this.httpConfiguration.getAuthMethod())) {
- return CompositeHttpConfigurer.combineConfigurers(configurer, new BasicAuthenticationHttpClientConfigurer(this.httpConfiguration.getAuthUsername(),
+ return CompositeHttpConfigurer.combineConfigurers(configurer, new BasicAuthenticationHttpClientConfigurer(this.httpConfiguration.getAuthUsername(),
this.httpConfiguration.getAuthPassword(), this.httpConfiguration.getAuthDomain(), this.httpConfiguration.getAuthHost()));
}
}
-
+
return configurer;
}
@@ -180,13 +180,13 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
}
String proxyAuthHost = getParameter(parameters, "proxyAuthHost", String.class);
Integer proxyAuthPort = getParameter(parameters, "proxyAuthPort", Integer.class);
-
+
if (proxyAuthHost != null && proxyAuthPort != null) {
String proxyAuthUsername = getParameter(parameters, "proxyAuthUsername", String.class);
String proxyAuthPassword = getParameter(parameters, "proxyAuthPassword", String.class);
String proxyAuthDomain = getParameter(parameters, "proxyAuthDomain", String.class);
String proxyAuthNtHost = getParameter(parameters, "proxyAuthNtHost", String.class);
-
+
if (proxyAuthUsername != null && proxyAuthPassword != null) {
return CompositeHttpConfigurer.combineConfigurers(
configurer, new ProxyHttpClientConfigurer(proxyAuthHost, proxyAuthPort, proxyAuthScheme, proxyAuthUsername, proxyAuthPassword, proxyAuthDomain, proxyAuthNtHost));
@@ -194,7 +194,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
return CompositeHttpConfigurer.combineConfigurers(configurer, new ProxyHttpClientConfigurer(proxyAuthHost, proxyAuthPort, proxyAuthScheme));
}
}
-
+
return configurer;
}
@@ -218,7 +218,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
}
final HttpClientBuilder clientBuilder = createHttpClientBuilder(uri, parameters, httpClientOptions);
-
+
HttpBinding httpBinding = resolveAndRemoveReferenceParameter(parameters, "httpBinding", HttpBinding.class);
HttpContext httpContext = resolveAndRemoveReferenceParameter(parameters, "httpContext", HttpContext.class);
@@ -229,9 +229,9 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
if (sslContextParameters == null) {
sslContextParameters = retrieveGlobalSslContextParameters();
}
-
+
String httpMethodRestrict = getAndRemoveParameter(parameters, "httpMethodRestrict", String.class);
-
+
HeaderFilterStrategy headerFilterStrategy = resolveAndRemoveReferenceParameter(parameters, "headerFilterStrategy", HeaderFilterStrategy.class);
UrlRewrite urlRewrite = resolveAndRemoveReferenceParameter(parameters, "urlRewrite", UrlRewrite.class);
@@ -239,7 +239,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
// need to set scheme on address uri depending on if its secure or not
String addressUri = (secure ? "https://" : "http://") + remaining;
-
+
addressUri = UnsafeUriCharactersEncoder.encodeHttpURI(addressUri);
URI uriHttpUriAddress = new URI(addressUri);
@@ -326,7 +326,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
endpoint.setCookieStore(getCookieStore());
}
endpoint.setHttpClientOptions(httpClientOptions);
-
+
return endpoint;
}
@@ -378,14 +378,14 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
}
return builder.build();
}
-
+
protected HttpClientConnectionManager createConnectionManager(Registry<ConnectionSocketFactory> registry) {
return createConnectionManager(registry, 0, 0);
}
-
+
protected HttpClientConnectionManager createConnectionManager(Registry<ConnectionSocketFactory> registry, int maxTotalConnections, int connectionsPerRoute) {
// setup the connection live time
- PoolingHttpClientConnectionManager answer =
+ PoolingHttpClientConnectionManager answer =
new PoolingHttpClientConnectionManager(registry, null, null, null, getConnectionTimeToLive(), TimeUnit.MILLISECONDS);
int localMaxTotalConnections = maxTotalConnections;
if (localMaxTotalConnections == 0) {
@@ -458,7 +458,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
// there are cases where we might end up here without component being created beforehand
// we need to abide by the component properties specified in the parameters when creating
- // the component, one such case is when we switch from "http4" to "https4" component name
+ // the component, one such case is when we switch from "http" to "https" component name
RestProducerFactoryHelper.setupComponentFor(url, camelContext, (Map<String, Object>) parameters.get("component"));
HttpEndpoint endpoint = camelContext.getEndpoint(url, HttpEndpoint.class);
@@ -566,7 +566,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
public void setConnectionsPerRoute(int connectionsPerRoute) {
this.connectionsPerRoute = connectionsPerRoute;
}
-
+
public long getConnectionTimeToLive() {
return connectionTimeToLive;
}
@@ -664,7 +664,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
clientConnectionManager.shutdown();
clientConnectionManager = null;
}
-
+
super.doStop();
}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpComponentVerifierExtension.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponentVerifierExtension.java
similarity index 99%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpComponentVerifierExtension.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponentVerifierExtension.java
index ba7bd9f..eea7a3a 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpComponentVerifierExtension.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponentVerifierExtension.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.net.UnknownHostException;
import java.util.HashMap;
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpConstants.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConstants.java
similarity index 96%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpConstants.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpConstants.java
index ddbf71f..dd96ab1 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpConstants.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
public final class HttpConstants {
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpDeleteWithBodyMethod.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpDeleteWithBodyMethod.java
similarity index 96%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpDeleteWithBodyMethod.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpDeleteWithBodyMethod.java
index 3bda52c..d8a37d9 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpDeleteWithBodyMethod.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpDeleteWithBodyMethod.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.net.URI;
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
similarity index 99%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
index 4d461cc..c48d9e8 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.Closeable;
import java.net.URI;
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEntityConverter.java
similarity index 99%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpEntityConverter.java
index 6a22d18..19a77b0 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpEntityConverter.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEntityConverter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpMethods.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMethods.java
similarity index 98%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpMethods.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpMethods.java
index 951b98c..6302580 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpMethods.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMethods.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
@@ -66,4 +66,4 @@ public enum HttpMethods implements Expression {
return ExpressionBuilder.constantExpression(name()).evaluate(exchange, type);
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
similarity index 98%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
index c2f3b7b..bf2fbc8 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
@@ -43,16 +43,16 @@ public class HttpPollingConsumer extends PollingConsumerSupport {
private final HttpEndpoint endpoint;
private HttpClient httpClient;
private HttpContext httpContext;
-
-
+
+
public HttpPollingConsumer(HttpEndpoint endpoint) {
super(endpoint);
this.endpoint = endpoint;
this.httpContext = endpoint.getHttpContext();
this.httpClient = endpoint.getHttpClient();
-
+
}
-
+
@Override
public HttpEndpoint getEndpoint() {
return (HttpEndpoint) super.getEndpoint();
@@ -128,7 +128,7 @@ public class HttpPollingConsumer extends PollingConsumerSupport {
}
}
}
-
+
/**
* Strategy when executing the method (calling the remote server).
*
@@ -137,7 +137,7 @@ public class HttpPollingConsumer extends PollingConsumerSupport {
* @throws IOException can be thrown
*/
protected HttpResponse executeMethod(HttpRequestBase httpRequest, HttpClientContext httpClientContext) throws IOException {
-
+
if (getEndpoint().isAuthenticationPreemptive()) {
BasicScheme basicAuth = new BasicScheme();
httpClientContext.setAttribute("preemptive-auth", basicAuth);
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpProducer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
similarity index 99%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpProducer.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
index 0fa1ba5..54fdd39 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpProducer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -39,7 +39,7 @@ import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.file.GenericFile;
-import org.apache.camel.component.http4.helper.HttpMethodHelper;
+import org.apache.camel.component.http.helper.HttpMethodHelper;
import org.apache.camel.converter.stream.CachedOutputStream;
import org.apache.camel.http.common.HttpHelper;
import org.apache.camel.http.common.HttpOperationFailedException;
@@ -175,7 +175,7 @@ public class HttpProducer extends DefaultProducer {
httpRequest.setHeader("Host", hostHeader);
}
}
-
+
if (getEndpoint().isConnectionClose()) {
httpRequest.addHeader("Connection", HTTP.CONN_CLOSE);
}
@@ -553,9 +553,9 @@ public class HttpProducer extends DefaultProducer {
if (answer == null) {
// force the body as an input stream since this is the fallback
InputStream is = in.getMandatoryBody(InputStream.class);
-
+
InputStreamEntity entity = new InputStreamEntity(is, -1);
-
+
if (contentType != null) {
entity.setContentType(contentType.toString());
}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpSendDynamicAware.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpSendDynamicAware.java
similarity index 95%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpSendDynamicAware.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpSendDynamicAware.java
index 0c81619..615c389 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpSendDynamicAware.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpSendDynamicAware.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.spi.annotations.SendDynamic;
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpUtil.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpUtil.java
similarity index 96%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/HttpUtil.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/HttpUtil.java
index 2c381fd..699cee9 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpUtil.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpUtil.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.Optional;
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/NoopCookieStore.java b/components/camel-http/src/main/java/org/apache/camel/component/http/NoopCookieStore.java
similarity index 97%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/NoopCookieStore.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/NoopCookieStore.java
index 757a54c..759a557 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/NoopCookieStore.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/NoopCookieStore.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.Collections;
import java.util.Date;
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/PreemptiveAuthInterceptor.java b/components/camel-http/src/main/java/org/apache/camel/component/http/PreemptiveAuthInterceptor.java
similarity index 98%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/PreemptiveAuthInterceptor.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/PreemptiveAuthInterceptor.java
index 8f3cae0..4e51749 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/PreemptiveAuthInterceptor.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/PreemptiveAuthInterceptor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
@@ -48,4 +48,4 @@ public class PreemptiveAuthInterceptor implements HttpRequestInterceptor {
}
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/ProxyHttpClientConfigurer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java
similarity index 98%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/ProxyHttpClientConfigurer.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java
index cd059fa..068aa45 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/ProxyHttpClientConfigurer.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
@@ -69,4 +69,4 @@ public class ProxyHttpClientConfigurer implements HttpClientConfigurer {
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpression.java b/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpression.java
similarity index 80%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpression.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpression.java
index 87702c1..30220a4 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpression.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.cloud;
+package org.apache.camel.component.http.cloud;
import org.apache.camel.impl.cloud.DefaultServiceCallExpression;
@@ -22,11 +22,11 @@ import org.apache.camel.impl.cloud.DefaultServiceCallExpression;
* The default is based on camel-http, this class is added to allow further
* customizations.
*/
-public final class Http4ServiceExpression extends DefaultServiceCallExpression {
- public Http4ServiceExpression() {
+public final class HttpServiceExpression extends DefaultServiceCallExpression {
+ public HttpServiceExpression() {
}
- public Http4ServiceExpression(String hostHeader, String portHeader) {
+ public HttpServiceExpression(String hostHeader, String portHeader) {
super(hostHeader, portHeader);
}
}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpressionFactory.java b/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpressionFactory.java
similarity index 87%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpressionFactory.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpressionFactory.java
index 124386a..adfadea 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/cloud/Http4ServiceExpressionFactory.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/cloud/HttpServiceExpressionFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.cloud;
+package org.apache.camel.component.http.cloud;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
@@ -22,9 +22,9 @@ import org.apache.camel.cloud.ServiceExpressionFactory;
import org.apache.camel.spi.annotations.CloudServiceFactory;
@CloudServiceFactory("http-service-expression,https-service-expression")
-public class Http4ServiceExpressionFactory implements ServiceExpressionFactory {
+public class HttpServiceExpressionFactory implements ServiceExpressionFactory {
@Override
public Expression newInstance(CamelContext camelContext) throws Exception {
- return new Http4ServiceExpression();
+ return new HttpServiceExpression();
}
}
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java b/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpMethodHelper.java
similarity index 94%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
rename to components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpMethodHelper.java
index 9b8544c..a88c906 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/helper/HttpMethodHelper.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpMethodHelper.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.helper;
+package org.apache.camel.component.http.helper;
import java.net.URI;
import java.net.URISyntaxException;
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeExchangeException;
-import org.apache.camel.component.http4.HttpEndpoint;
-import org.apache.camel.component.http4.HttpMethods;
+import org.apache.camel.component.http.HttpEndpoint;
+import org.apache.camel.component.http.HttpMethods;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
public final class HttpMethodHelper {
@@ -36,7 +36,7 @@ public final class HttpMethodHelper {
*
* @param exchange the exchange
* @return the created method
- * @throws URISyntaxException
+ * @throws URISyntaxException
*/
public static HttpMethods createMethod(Exchange exchange, HttpEndpoint endpoint, boolean hasPayload) throws URISyntaxException {
// is a query string provided in the endpoint URI or in a header (header
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/package.html b/components/camel-http/src/main/java/org/apache/camel/component/http/package.html
similarity index 100%
rename from components/camel-http/src/main/java/org/apache/camel/component/http4/package.html
rename to components/camel-http/src/main/java/org/apache/camel/component/http/package.html
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpMethodsConverter.java b/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpMethodsConverter.java
deleted file mode 100644
index cf1ec9e..0000000
--- a/components/camel-http/src/main/java/org/apache/camel/component/http4/HttpMethodsConverter.java
+++ /dev/null
@@ -1,40 +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.http4;
-
-import java.util.Locale;
-
-import org.apache.camel.Converter;
-import org.apache.camel.Exchange;
-
-/**
- * To convert between camel-http and camel-http-common for the http methods enums
- */
-@Converter(loader = true)
-public final class HttpMethodsConverter {
-
- private HttpMethodsConverter() {
- }
-
- @Converter
- public static HttpMethods toHttp4Methods(org.apache.camel.http.common.HttpMethods method, Exchange exchange) throws Exception {
- String name = method.name();
- name = name.toUpperCase(Locale.ENGLISH);
- return HttpMethods.valueOf(name);
- }
-
-}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/BaseHttpTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/BaseHttpTest.java
index 33a7729..98858d8 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/BaseHttpTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.Map;
@@ -46,4 +46,4 @@ public abstract class BaseHttpTest extends HttpServerTestSupport {
protected String getExpectedContent() {
return "camel rocks!";
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/BaseHttpsTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/BaseHttpsTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/BaseHttpsTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/BaseHttpsTest.java
index 284e338..a7edd84 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/BaseHttpsTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/BaseHttpsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.Map;
@@ -46,4 +46,4 @@ public abstract class BaseHttpsTest extends HttpsServerTestSupport {
protected String getExpectedContent() {
return "camel rocks!";
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/CamelComponentVerifierExtensionTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierExtensionTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/CamelComponentVerifierExtensionTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierExtensionTest.java
index 96421e2..281ae13 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/CamelComponentVerifierExtensionTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierExtensionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
import java.util.Arrays;
@@ -23,8 +23,8 @@ import java.util.Map;
import org.apache.camel.Component;
import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.apache.camel.component.http4.handler.AuthenticationValidationHandler;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.AuthenticationValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
@@ -259,4 +259,4 @@ public class CamelComponentVerifierExtensionTest extends BaseHttpTest {
Assert.assertEquals(getLocalServerUri("/redirected"), error.getDetails().get(ComponentVerifierExtension.VerificationError.HttpAttribute.HTTP_REDIRECT));
Assert.assertTrue(error.getParameterKeys().contains("httpUri"));
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/CamelComponentVerifierTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/CamelComponentVerifierTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
index 5e8e63f..21c0d76 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/CamelComponentVerifierTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/CamelComponentVerifierTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
import java.util.Arrays;
@@ -22,8 +22,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.apache.camel.component.http4.handler.AuthenticationValidationHandler;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.AuthenticationValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
@@ -258,4 +258,4 @@ public class CamelComponentVerifierTest extends BaseHttpTest {
Assert.assertEquals(getLocalServerUri("/redirected"), error.getDetails().get(ComponentVerifierExtension.VerificationError.HttpAttribute.HTTP_REDIRECT));
Assert.assertTrue(error.getParameterKeys().contains("httpUri"));
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/GoogleUrlRewrite.java b/components/camel-http/src/test/java/org/apache/camel/component/http/GoogleUrlRewrite.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/GoogleUrlRewrite.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/GoogleUrlRewrite.java
index d760fb3..e353709 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/GoogleUrlRewrite.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/GoogleUrlRewrite.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Producer;
import org.apache.camel.http.common.UrlRewrite;
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HeaderFilteringTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HeaderFilteringTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HeaderFilteringTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HeaderFilteringTest.java
index 1e01cac..7d45db2 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HeaderFilteringTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HeaderFilteringTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpAuthenticationTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpAuthenticationTest.java
index 33a089b..e372d81 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpAuthenticationTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.ArrayList;
import java.util.List;
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.AuthenticationValidationHandler;
+import org.apache.camel.component.http.handler.AuthenticationValidationHandler;
import org.apache.http.HttpRequestInterceptor;
import org.apache.http.HttpResponseInterceptor;
import org.apache.http.HttpStatus;
@@ -41,10 +41,10 @@ import org.junit.Test;
public class HttpAuthenticationTest extends BaseHttpTest {
private HttpServer localServer;
-
+
private String user = "camel";
private String password = "password";
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -69,21 +69,21 @@ public class HttpAuthenticationTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void basicAuthenticationShouldSuccess() throws Exception {
- Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/search?authUsername=" + user + "&authPassword="
+ Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/search?authUsername=" + user + "&authPassword="
+ password, new Processor() {
public void process(Exchange exchange) throws Exception {
}
});
assertExchange(exchange);
}
-
-
+
+
@Test
public void basicAuthenticationPreemptiveShouldSuccess() throws Exception {
- Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/search?authUsername=" + user + "&authPassword="
+ Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/search?authUsername=" + user + "&authPassword="
+ password + "&authenticationPreemptive=true", new Processor() {
public void process(Exchange exchange) throws Exception {
}
@@ -104,7 +104,7 @@ public class HttpAuthenticationTest extends BaseHttpTest {
@Test
public void basicAuthenticationShouldFailWithWrongCreds() throws Exception {
- Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort()
+ Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort()
+ "/search?throwExceptionOnFailure=false&authUsername=camel&authPassword=wrong", new Processor() {
public void process(Exchange exchange) throws Exception {
}
@@ -137,4 +137,4 @@ public class HttpAuthenticationTest extends BaseHttpTest {
assertEquals("", out.getBody(String.class));
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpBodyTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpBodyTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyTest.java
index 9c99fec..f1cf640 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpBodyTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -23,8 +23,8 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
-import org.apache.camel.component.http4.handler.HeaderValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.HeaderValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -37,13 +37,13 @@ public class HttpBodyTest extends BaseHttpTest {
// default content encoding of the local test server
private String charset = "ISO-8859-1";
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
Map<String, String> expectedHeaders = new HashMap<>();
expectedHeaders.put("Content-Type", "image/jpeg");
-
+
localServer = ServerBootstrap.bootstrap().
setHttpProcessor(getBasicHttpProcessor()).
setConnectionReuseStrategy(getConnectionReuseStrategy()).
@@ -66,12 +66,12 @@ public class HttpBodyTest extends BaseHttpTest {
if (localServer != null) {
localServer.stop();
}
- }
-
+ }
+
public String getProtocolString() {
return protocolString;
}
-
+
public void setProtocolString(String protocol) {
protocolString = protocol;
}
@@ -128,4 +128,4 @@ public class HttpBodyTest extends BaseHttpTest {
protected String getBody() {
return "hl=de&q=camel+rocks";
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpBodyWithOtherProtocalNameTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyWithOtherProtocalNameTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpBodyWithOtherProtocalNameTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyWithOtherProtocalNameTest.java
index 0118f69..61bb60f 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpBodyWithOtherProtocalNameTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBodyWithOtherProtocalNameTest.java
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.CamelContext;
import org.junit.Before;
public class HttpBodyWithOtherProtocalNameTest extends HttpBodyTest {
-
+
@Before
@Override
public void setUp() throws Exception {
super.setUp();
setProtocolString("newHttp://");
}
-
+
@Override
public CamelContext createCamelContext() throws Exception {
CamelContext answer = super.createCamelContext();
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
index 1af2cef..7db63c9 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpBridgeEndpointTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpBridgeEndpointTest.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicRawQueryValidationHandler;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicRawQueryValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -29,7 +29,7 @@ import org.junit.Test;
public class HttpBridgeEndpointTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -55,7 +55,7 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void notBridgeEndpoint() throws Exception {
Exchange exchange = template.request("http://host/?bridgeEndpoint=false", new Processor() {
@@ -116,4 +116,4 @@ public class HttpBridgeEndpointTest extends BaseHttpTest {
assertExchange(exchange);
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCamelHeadersNotCopiedTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersNotCopiedTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCamelHeadersNotCopiedTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersNotCopiedTest.java
index c91d9e7..7c764b9 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCamelHeadersNotCopiedTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersNotCopiedTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.Map;
@@ -38,4 +38,4 @@ public class HttpCamelHeadersNotCopiedTest extends HttpCamelHeadersTest {
protected String setupEndpointParams() {
return "?copyHeaders=false";
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCamelHeadersTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCamelHeadersTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersTest.java
index 17e6f23..781c8e8 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCamelHeadersTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCamelHeadersTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
import java.util.HashMap;
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.HeaderValidationHandler;
+import org.apache.camel.component.http.handler.HeaderValidationHandler;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCharsetTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCharsetTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCharsetTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpCharsetTest.java
index d8cdb66..af17a40 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCharsetTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCharsetTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.ByteArrayInputStream;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -31,9 +31,9 @@ public class HttpCharsetTest extends BaseHttpTest {
// default content encoding of the local test server
private String charset = "ISO-8859-1";
-
+
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -107,4 +107,4 @@ public class HttpCharsetTest extends BaseHttpTest {
+ lattinSmallLetterUWithDiaeresis
+ lattinSmallLetterSharpS;
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpClientConfigurerTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpClientConfigurerTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpClientConfigurerTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpClientConfigurerTest.java
index 3d937fa..ae85436 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpClientConfigurerTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpClientConfigurerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -22,7 +22,7 @@ import org.junit.Test;
public class HttpClientConfigurerTest extends CamelTestSupport {
private HttpClientConfigurer configurer;
-
+
@Test
public void testHttpClientConfigurer() throws Exception {
HttpClientConfigurer gotConfigurer = getMandatoryEndpoint("http://www.google.com/search", HttpEndpoint.class).getHttpClientConfigurer();
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCompressionTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCompressionTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCompressionTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpCompressionTest.java
index 819b8a6..4f7edbc 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCompressionTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCompressionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
import java.io.InputStream;
@@ -29,7 +29,7 @@ import java.util.zip.GZIPOutputStream;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.HeaderValidationHandler;
+import org.apache.camel.component.http.handler.HeaderValidationHandler;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpEntityEnclosingRequest;
@@ -55,14 +55,14 @@ import org.junit.Test;
public class HttpCompressionTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
Map<String, String> expectedHeaders = new HashMap<>();
expectedHeaders.put("Content-Type", "text/plain");
expectedHeaders.put("Content-Encoding", "gzip");
-
+
localServer = ServerBootstrap.bootstrap().
setHttpProcessor(getBasicHttpProcessor()).
setConnectionReuseStrategy(getConnectionReuseStrategy()).
@@ -84,7 +84,7 @@ public class HttpCompressionTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void compressedHttpPost() throws Exception {
Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/", new Processor() {
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpConcurrentTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpConcurrentTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpConcurrentTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpConcurrentTest.java
index ef887e9..df92580 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpConcurrentTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpConcurrentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
import java.util.HashMap;
@@ -46,7 +46,7 @@ public class HttpConcurrentTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCustomComponentNameTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCustomComponentNameTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCustomComponentNameTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpCustomComponentNameTest.java
index fa6c17c..fe281e0 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpCustomComponentNameTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpCustomComponentNameTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpDefaultPortNumberTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpDefaultPortNumberTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java
index 84b1e68..0579e6d 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpDefaultPortNumberTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDefaultPortNumberTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.conn.HttpHostConnectException;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
@@ -33,7 +33,7 @@ import org.junit.Test;
public class HttpDefaultPortNumberTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -58,7 +58,7 @@ public class HttpDefaultPortNumberTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void testHttpConnectionWithTwoRoutesAndOneWithDefaultPort() throws Exception {
context.addRoutes(new RouteBuilder() {
@@ -149,4 +149,4 @@ public class HttpDefaultPortNumberTest extends BaseHttpTest {
//with message:
assertEquals("Connection to http://127.0.0.1" + portExt + " refused", exchange.getException().getMessage());
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpDisableStreamCacheTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpDisableStreamCacheTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java
index d5c9d87..d710be7 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpDisableStreamCacheTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpDisableStreamCacheTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.InputStream;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.TypeConversionException;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -31,7 +31,7 @@ import org.junit.Test;
public class HttpDisableStreamCacheTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -57,7 +57,7 @@ public class HttpDisableStreamCacheTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void httpDisableStreamCache() throws Exception {
Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/test/?disableStreamCache=true", new Processor() {
@@ -81,4 +81,4 @@ public class HttpDisableStreamCacheTest extends BaseHttpTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpEndpointOptionsNotChangeComponentTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpEndpointOptionsNotChangeComponentTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java
index 9cba753..c3a764d 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpEndpointOptionsNotChangeComponentTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointOptionsNotChangeComponentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
@@ -64,7 +64,7 @@ public class HttpEndpointOptionsNotChangeComponentTest extends CamelTestSupport
// and the default option has not been messed with
HttpEndpoint end3 = context.getEndpoint("http://www.google.com", HttpEndpoint.class);
assertIsInstanceOf(MyBinding.class, end3.getHttpBinding());
-
+
// test the headerFilterStrategy
HttpEndpoint end4 = context.getEndpoint("http://www.google.com?headerFilterStrategy=#myStrategy", HttpEndpoint.class);
assertIsInstanceOf(MyHeaderFilterStrategy.class, end4.getHeaderFilterStrategy());
@@ -75,7 +75,7 @@ public class HttpEndpointOptionsNotChangeComponentTest extends CamelTestSupport
private static class MyOtherBinding extends DefaultHttpBinding {
}
-
+
private static class MyHeaderFilterStrategy extends HttpHeaderFilterStrategy {
}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointURLTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointURLTest.java
index 1e88684..6fcffe9 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpEndpointURLTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -24,23 +24,23 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.junit.Test;
public class HttpEndpointURLTest extends CamelTestSupport {
-
+
@Test
public void testHttpEndpointURLWithIPv6() {
HttpEndpoint endpoint = (HttpEndpoint)context.getEndpoint("http://[2a00:8a00:6000:40::1413]:30300/test?test=true");
assertEquals("http://[2a00:8a00:6000:40::1413]:30300/test?test=true", endpoint.getHttpUri().toString());
}
-
+
@Test
public void testHttpEndpointHttpUri() throws Exception {
HttpEndpoint http1 = context.getEndpoint("http://www.google.com", HttpEndpoint.class);
HttpEndpoint http2 = context.getEndpoint("https://www.google.com?test=parameter&proxyAuthHost=myotherproxy&proxyAuthPort=2345", HttpEndpoint.class);
HttpEndpoint http3 = context.getEndpoint("https://www.google.com?test=parameter", HttpEndpoint.class);
-
+
assertEquals("Get a wrong HttpUri of http1", "http://www.google.com", http1.getHttpUri().toString());
assertEquals("Get a wrong HttpUri of http2", "https://www.google.com?test=parameter", http2.getHttpUri().toString());
assertEquals("Get a wrong HttpUri of http2 andhttp3", http2.getHttpUri(), http3.getHttpUri());
-
+
try {
// need to catch the exception here
context.getEndpoint("https://http://www.google.com", HttpEndpoint.class);
@@ -49,7 +49,7 @@ public class HttpEndpointURLTest extends CamelTestSupport {
assertTrue("Get a wrong exception message", ex.getMessage().indexOf("You have duplicated the http(s) protocol") > 0);
}
}
-
+
@Test
public void testConnectionManagerFromHttpUri() throws Exception {
HttpEndpoint http1 = context.getEndpoint("http://www.google.com?maxTotalConnections=40&connectionsPerRoute=5", HttpEndpoint.class);
@@ -60,7 +60,7 @@ public class HttpEndpointURLTest extends CamelTestSupport {
assertEquals("Get a wrong setting of maxTotalConnections", 40, poolManager.getMaxTotal());
assertEquals("Get a wrong setting of connectionsPerRoute", 5, poolManager.getDefaultMaxPerRoute());
}
-
+
@Test
// Just for CAMEL-8607
public void testRawWithUnsafeCharacters() throws Exception {
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpInvalidConfigurationTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidConfigurationTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpInvalidConfigurationTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidConfigurationTest.java
index b7f9122..1f75908 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpInvalidConfigurationTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidConfigurationTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Exchange;
import org.apache.camel.FailedToCreateRouteException;
@@ -24,7 +24,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.camel.component.http4.HttpMethods.POST;
+import static org.apache.camel.component.http.HttpMethods.POST;
/**
* Unit test of invalid configuration
@@ -56,4 +56,4 @@ public class HttpInvalidConfigurationTest extends CamelTestSupport {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpInvalidHttpClientConfigurationTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidHttpClientConfigurationTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpInvalidHttpClientConfigurationTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidHttpClientConfigurationTest.java
index edfcc5d..9c2f065 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpInvalidHttpClientConfigurationTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpInvalidHttpClientConfigurationTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Exchange;
import org.apache.camel.FailedToCreateRouteException;
@@ -24,7 +24,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.camel.component.http4.HttpMethods.POST;
+import static org.apache.camel.component.http.HttpMethods.POST;
/**
* Unit test of invalid configuration
@@ -56,4 +56,4 @@ public class HttpInvalidHttpClientConfigurationTest extends CamelTestSupport {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpMethodsTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpMethodsTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
index f375503..d4732f1 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpMethodsTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpMethodsTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.HttpStatus;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
@@ -32,7 +32,7 @@ import org.junit.Test;
public class HttpMethodsTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -67,7 +67,7 @@ public class HttpMethodsTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void httpGet() throws Exception {
@@ -78,7 +78,7 @@ public class HttpMethodsTest extends BaseHttpTest {
assertExchange(exchange);
}
-
+
@Test
public void httpGetWithUriParam() throws Exception {
@@ -215,7 +215,7 @@ public class HttpMethodsTest extends BaseHttpTest {
assertExchange(exchange);
- // the http4 server will not provide body on HTTP DELETE so we cannot test the server side
+ // the http server will not provide body on HTTP DELETE so we cannot test the server side
}
@Test
@@ -235,4 +235,4 @@ public class HttpMethodsTest extends BaseHttpTest {
assertNull(out.getBody(String.class));
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpNoCamelHeaderTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoCamelHeaderTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpNoCamelHeaderTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoCamelHeaderTest.java
index cd0518e..0a71203 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpNoCamelHeaderTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoCamelHeaderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java
index edb6d93..12efc3a 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionRedeliveryTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.net.ConnectException;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -31,7 +31,7 @@ import org.junit.Test;
public class HttpNoConnectionRedeliveryTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -56,7 +56,7 @@ public class HttpNoConnectionRedeliveryTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void httpConnectionOk() throws Exception {
Exchange exchange = template.request("direct:start", null);
@@ -98,4 +98,4 @@ public class HttpNoConnectionRedeliveryTest extends BaseHttpTest {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
index cdcef15..ee5721a 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpNoConnectionTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.net.ConnectException;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -31,7 +31,7 @@ import org.junit.Test;
public class HttpNoConnectionTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -56,7 +56,7 @@ public class HttpNoConnectionTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void httpConnectionOk() throws Exception {
Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/search", new Processor() {
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpPathTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPathTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpPathTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpPathTest.java
index 03392f4..d4e4e11 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpPathTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPathTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -28,7 +28,7 @@ import org.junit.Test;
public class HttpPathTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -56,7 +56,7 @@ public class HttpPathTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void httpPath() throws Exception {
Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/search", new Processor() {
@@ -104,7 +104,7 @@ public class HttpPathTest extends BaseHttpTest {
@Test
public void httpEscapedCharacters() throws Exception {
Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/test%20/path", new Processor() {
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) throws Exception {
}
});
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpPollingConsumerTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java
similarity index 91%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpPollingConsumerTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java
index 81d6890..48131e7 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpPollingConsumerTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpPollingConsumerTest.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.net.SocketTimeoutException;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.http4.handler.DelayValidationHandler;
+import org.apache.camel.component.http.handler.DelayValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -31,7 +31,7 @@ public class HttpPollingConsumerTest extends BaseHttpTest {
private HttpServer localServer;
private String user = "camel";
private String password = "password";
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -56,23 +56,23 @@ public class HttpPollingConsumerTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void basicAuthenticationShouldSuccess() throws Exception {
- String body = consumer.receiveBody("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/?authUsername=" + user + "&authPassword="
+ String body = consumer.receiveBody("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/?authUsername=" + user + "&authPassword="
+ password, String.class);
- assertEquals(getExpectedContent(), body);
-
+ assertEquals(getExpectedContent(), body);
+
}
-
+
@Test
public void basicAuthenticationPreemptiveShouldSuccess() throws Exception {
-
- String body = consumer.receiveBody("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/?authUsername=" + user + "&authPassword="
- + password + "&authenticationPreemptive=true", String.class);
+
+ String body = consumer.receiveBody("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/?authUsername=" + user + "&authPassword="
+ + password + "&authenticationPreemptive=true", String.class);
assertEquals(getExpectedContent(), body);
}
-
+
@Test
public void testReceive() throws Exception {
String body = consumer.receiveBody("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/", String.class);
@@ -94,4 +94,4 @@ public class HttpPollingConsumerTest extends BaseHttpTest {
assertIsInstanceOf(SocketTimeoutException.class, e.getCause());
}
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerConnectionCloseTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerConnectionCloseTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerConnectionCloseTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerConnectionCloseTest.java
index b30969b..a187c34 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerConnectionCloseTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerConnectionCloseTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.http.common.HttpHeaderFilterStrategy;
import org.apache.camel.spi.Registry;
@@ -36,9 +36,9 @@ public class HttpProducerConnectionCloseTest extends BaseHttpTest {
@EndpointInject("mock:result")
protected MockEndpoint mockResultEndpoint;
-
+
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -69,7 +69,7 @@ public class HttpProducerConnectionCloseTest extends BaseHttpTest {
public void noDataDefaultIsGet() throws Exception {
HttpComponent component = context.getComponent("http", HttpComponent.class);
component.setConnectionTimeToLive(1000L);
- HttpEndpoint endpoiont = (HttpEndpoint) component.createEndpoint("http://" + localServer.getInetAddress().getHostName() + ":"
+ HttpEndpoint endpoiont = (HttpEndpoint) component.createEndpoint("http://" + localServer.getInetAddress().getHostName() + ":"
+ localServer.getLocalPort() + "/myget?headerFilterStrategy=#myFilter");
HttpProducer producer = new HttpProducer(endpoiont);
Exchange exchange = producer.createExchange();
@@ -88,7 +88,7 @@ public class HttpProducerConnectionCloseTest extends BaseHttpTest {
ConnectionCloseHeaderFilter connectionCloseFilterStrategy = new ConnectionCloseHeaderFilter();
registry.bind("myFilter", connectionCloseFilterStrategy);
}
-
+
class ConnectionCloseHeaderFilter extends HttpHeaderFilterStrategy {
@Override
protected void initialize() {
@@ -96,4 +96,4 @@ public class HttpProducerConnectionCloseTest extends BaseHttpTest {
getOutFilter().remove("connection");
}
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerContentLengthTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentLengthTest.java
similarity index 94%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerContentLengthTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentLengthTest.java
index d777ed3..7d6dd88 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerContentLengthTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentLengthTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -36,12 +36,12 @@ import org.junit.Before;
import org.junit.Test;
public class HttpProducerContentLengthTest extends BaseHttpTest {
-
+
private HttpServer localServer;
-
+
private final String bodyContent = "{ \n \"content\"=\"This is content\" \n }";
-
-
+
+
@Before
@Override
public void setUp() throws Exception {
@@ -58,7 +58,7 @@ public class HttpProducerContentLengthTest extends BaseHttpTest {
String contentLength = contentLengthHeader != null ? contentLengthHeader.getValue() : "";
Header transferEncodingHeader = request.getFirstHeader(Exchange.TRANSFER_ENCODING);
String transferEncoding = transferEncodingHeader != null ? transferEncodingHeader.getValue() : "";
-
+
//Request Body Chunked if no Content-Length set.
assertEquals("", contentLength);
assertEquals("chunked", transferEncoding);
@@ -71,7 +71,7 @@ public class HttpProducerContentLengthTest extends BaseHttpTest {
String contentLength = contentLengthHeader != null ? contentLengthHeader.getValue() : "";
Header transferEncodingHeader = request.getFirstHeader(Exchange.TRANSFER_ENCODING);
String transferEncoding = transferEncodingHeader != null ? transferEncodingHeader.getValue() : "";
-
+
//Content-Length should match byte array
assertEquals("35", contentLength);
assertEquals("", transferEncoding);
@@ -79,7 +79,7 @@ public class HttpProducerContentLengthTest extends BaseHttpTest {
}
})
.create();
-
+
localServer.start();
super.setUp();
@@ -94,7 +94,7 @@ public class HttpProducerContentLengthTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void testContentLengthStream() throws Exception {
Exchange out = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/content-streamed?bridgeEndpoint=true", new Processor() {
@@ -105,14 +105,14 @@ public class HttpProducerContentLengthTest extends BaseHttpTest {
exchange.getIn().setHeader(Exchange.CONTENT_TYPE, "application/json");
exchange.getIn().setBody(new ByteArrayInputStreamCache(new ByteArrayInputStream(bodyContent.getBytes())));
}
-
+
});
assertNotNull(out);
assertFalse("Should not fail", out.isFailed());
-
+
}
-
+
@Test
public void testContentLengthNotStreamed() throws Exception {
Exchange out = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/content-not-streamed?bridgeEndpoint=true", new Processor() {
@@ -123,13 +123,13 @@ public class HttpProducerContentLengthTest extends BaseHttpTest {
exchange.getIn().setHeader(Exchange.CONTENT_TYPE, "application/json");
exchange.getIn().setBody(bodyContent.getBytes());
}
-
+
});
assertNotNull(out);
assertFalse("Should not fail", out.isFailed());
-
+
}
-
-
-}
\ No newline at end of file
+
+
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeTest.java
index 88edb4d..d14a94c 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
@@ -36,9 +36,9 @@ import org.junit.Test;
public class HttpProducerContentTypeTest extends BaseHttpTest {
private static final String CONTENT_TYPE = "multipart/form-data boundary=---------------------------j2radvtrk";
-
+
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -52,7 +52,7 @@ public class HttpProducerContentTypeTest extends BaseHttpTest {
@Override
public void handle(HttpRequest request, HttpResponse response, HttpContext context) throws HttpException, IOException {
String contentType = request.getFirstHeader(Exchange.CONTENT_TYPE).getValue();
-
+
assertEquals(CONTENT_TYPE, contentType);
response.setEntity(new StringEntity(contentType, "ASCII"));
@@ -73,7 +73,7 @@ public class HttpProducerContentTypeTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void testContentTypeWithBoundary() throws Exception {
Exchange out = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/content", new Processor() {
@@ -83,15 +83,15 @@ public class HttpProducerContentTypeTest extends BaseHttpTest {
exchange.getIn().setHeader(Exchange.CONTENT_TYPE, CONTENT_TYPE);
exchange.getIn().setBody("This is content");
}
-
+
});
assertNotNull(out);
assertFalse("Should not fail", out.isFailed());
assertEquals(CONTENT_TYPE, out.getOut().getBody(String.class));
-
+
}
-
+
@Test
public void testContentTypeWithBoundaryWithIgnoreResponseBody() throws Exception {
Exchange out = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/content?ignoreResponseBody=true", new Processor() {
@@ -101,12 +101,12 @@ public class HttpProducerContentTypeTest extends BaseHttpTest {
exchange.getIn().setHeader(Exchange.CONTENT_TYPE, CONTENT_TYPE);
exchange.getIn().setBody("This is content");
}
-
+
});
assertNotNull(out);
assertFalse("Should not fail", out.isFailed());
assertNull(out.getOut().getBody());
-
+
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeWithSemiColomnTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithSemiColomnTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeWithSemiColomnTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithSemiColomnTest.java
index 343fba9..27ce43a 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerContentTypeWithSemiColomnTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerContentTypeWithSemiColomnTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
@@ -36,9 +36,9 @@ import org.junit.Test;
public class HttpProducerContentTypeWithSemiColomnTest extends BaseHttpTest {
private static final String CONTENT_TYPE = "multipart/form-data;boundary=---------------------------j2radvtrk";
-
+
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -52,7 +52,7 @@ public class HttpProducerContentTypeWithSemiColomnTest extends BaseHttpTest {
@Override
public void handle(HttpRequest request, HttpResponse response, HttpContext context) throws HttpException, IOException {
String contentType = request.getFirstHeader(Exchange.CONTENT_TYPE).getValue();
-
+
assertEquals(CONTENT_TYPE.replace(";", "; "), contentType);
response.setEntity(new StringEntity(contentType, "ASCII"));
@@ -73,7 +73,7 @@ public class HttpProducerContentTypeWithSemiColomnTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void testContentTypeWithBoundary() throws Exception {
Exchange out = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/content", new Processor() {
@@ -83,15 +83,15 @@ public class HttpProducerContentTypeWithSemiColomnTest extends BaseHttpTest {
exchange.getIn().setHeader(Exchange.CONTENT_TYPE, CONTENT_TYPE);
exchange.getIn().setBody("This is content");
}
-
+
});
assertNotNull(out);
assertFalse("Should not fail", out.isFailed());
assertEquals(CONTENT_TYPE.replace(";", "; "), out.getOut().getBody(String.class));
-
+
}
-
+
@Test
public void testContentTypeWithBoundaryWithIgnoreResponseBody() throws Exception {
Exchange out = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/content?ignoreResponseBody=true", new Processor() {
@@ -101,12 +101,12 @@ public class HttpProducerContentTypeWithSemiColomnTest extends BaseHttpTest {
exchange.getIn().setHeader(Exchange.CONTENT_TYPE, CONTENT_TYPE);
exchange.getIn().setBody("This is content");
}
-
+
});
assertNotNull(out);
assertFalse("Should not fail", out.isFailed());
assertNull(out.getOut().getBody());
-
+
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerExplicitConnectionCloseTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerExplicitConnectionCloseTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
index df0a6dd..e536fa5 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerExplicitConnectionCloseTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerExplicitConnectionCloseTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
@@ -34,9 +34,9 @@ public class HttpProducerExplicitConnectionCloseTest extends BaseHttpTest {
@EndpointInject("mock:result")
protected MockEndpoint mockResultEndpoint;
-
+
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -67,7 +67,7 @@ public class HttpProducerExplicitConnectionCloseTest extends BaseHttpTest {
public void noDataDefaultIsGet() throws Exception {
HttpComponent component = context.getComponent("http", HttpComponent.class);
component.setConnectionTimeToLive(1000L);
- HttpEndpoint endpoiont = (HttpEndpoint) component.createEndpoint("http://" + localServer.getInetAddress().getHostName() + ":"
+ HttpEndpoint endpoiont = (HttpEndpoint) component.createEndpoint("http://" + localServer.getInetAddress().getHostName() + ":"
+ localServer.getLocalPort() + "/myget?connectionClose=true");
HttpProducer producer = new HttpProducer(endpoiont);
Exchange exchange = producer.createExchange();
@@ -79,4 +79,4 @@ public class HttpProducerExplicitConnectionCloseTest extends BaseHttpTest {
assertEquals(HTTP.CONN_CLOSE, exchange.getOut().getHeader("connection"));
assertExchange(exchange);
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerSelectMethodTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerSelectMethodTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
index bf8ac48..d656410 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerSelectMethodTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSelectMethodTest.java
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Exchange;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.camel.component.http4.HttpMethods.GET;
-import static org.apache.camel.component.http4.HttpMethods.POST;
+import static org.apache.camel.component.http.HttpMethods.GET;
+import static org.apache.camel.component.http.HttpMethods.POST;
/**
* Unit test to verify the algorithm for selecting either GET or POST.
@@ -33,7 +33,7 @@ import static org.apache.camel.component.http4.HttpMethods.POST;
public class HttpProducerSelectMethodTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -65,7 +65,7 @@ public class HttpProducerSelectMethodTest extends BaseHttpTest {
@Test
public void noDataDefaultIsGet() throws Exception {
HttpComponent component = context.getComponent("http", HttpComponent.class);
-
+
HttpEndpoint endpoiont = (HttpEndpoint) component.createEndpoint("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/myget");
HttpProducer producer = new HttpProducer(endpoiont);
Exchange exchange = producer.createExchange();
@@ -166,8 +166,8 @@ public class HttpProducerSelectMethodTest extends BaseHttpTest {
producer.process(exchange);
producer.stop();
}
-
- @Test
+
+ @Test
public void withHttpURIInHeader() throws Exception {
HttpComponent component = context.getComponent("http", HttpComponent.class);
@@ -196,4 +196,4 @@ public class HttpProducerSelectMethodTest extends BaseHttpTest {
producer.process(exchange);
producer.stop();
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerSessionTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSessionTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerSessionTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSessionTest.java
index 9cc4c17..e77b203 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerSessionTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerSessionTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.net.InetSocketAddress;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.handler.SessionReflectionHandler;
+import org.apache.camel.component.http.handler.SessionReflectionHandler;
import org.apache.camel.http.common.cookie.ExchangeCookieHandler;
import org.apache.camel.http.common.cookie.InstanceCookieHandler;
import org.apache.camel.test.AvailablePortFinder;
@@ -35,13 +35,13 @@ import org.junit.Test;
public class HttpProducerSessionTest extends CamelTestSupport {
private static volatile int port;
private static Server localServer;
-
+
@BindToRegistry("instanceCookieHandler")
private InstanceCookieHandler instanceHandler = new InstanceCookieHandler();
-
+
@BindToRegistry("exchangeCookieHandler")
private ExchangeCookieHandler exchangeHandler = new ExchangeCookieHandler();
-
+
@BindToRegistry("noopCookieStore")
private NoopCookieStore cookieStore = new NoopCookieStore();
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoHeadersWithSameKeyTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoHeadersWithSameKeyTest.java
index bf47935..59ea377 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoHeadersWithSameKeyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
import java.util.ArrayList;
@@ -42,7 +42,7 @@ import org.junit.Test;
public class HttpProducerTwoHeadersWithSameKeyTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -96,7 +96,7 @@ public class HttpProducerTwoHeadersWithSameKeyTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void testTwoHeadersWithSameKeyHeader() throws Exception {
Exchange out = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/myapp", new Processor() {
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoParametersWithSameKeyTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoParametersWithSameKeyTest.java
index cd8015e..8c1d94a 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerTwoParametersWithSameKeyTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
import java.util.List;
@@ -39,7 +39,7 @@ import org.junit.Test;
public class HttpProducerTwoParametersWithSameKeyTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -76,7 +76,7 @@ public class HttpProducerTwoParametersWithSameKeyTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void testTwoParametersWithSameKey() throws Exception {
Exchange out = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/myapp?from=me&to=foo&to=bar", null);
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerWithSystemPropertiesTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerWithSystemPropertiesTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerWithSystemPropertiesTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerWithSystemPropertiesTest.java
index 2dccad8..baddf89 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProducerWithSystemPropertiesTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProducerWithSystemPropertiesTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.HashMap;
import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.HeaderValidationHandler;
+import org.apache.camel.component.http.handler.HeaderValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyServerTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyServerTest.java
index 6bb9a43..9bbf6f1 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpProxyServerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
import java.util.ArrayList;
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.HeaderValidationHandler;
+import org.apache.camel.component.http.handler.HeaderValidationHandler;
import org.apache.camel.util.URISupport;
import org.apache.commons.codec.BinaryDecoder;
import org.apache.commons.codec.DecoderException;
@@ -95,7 +95,7 @@ public class HttpProxyServerTest extends BaseHttpTest {
HttpEndpoint http1 = context.getEndpoint("http://www.google.com?proxyAuthHost=www.myproxy.com&proxyAuthPort=1234", HttpEndpoint.class);
HttpEndpoint http2 = context.getEndpoint("http://www.google.com?test=parameter&proxyAuthHost=www.otherproxy.com&proxyAuthPort=2345", HttpEndpoint.class);
// HttpClientBuilder doesn't support get the configuration here
-
+
//As the endpointUri is recreated, so the parameter could be in different place, so we use the URISupport.normalizeUri
assertEquals("Get a wrong endpoint uri of http1", "http://www.google.com?proxyAuthHost=www.myproxy.com&proxyAuthPort=1234", URISupport.normalizeUri(http1.getEndpointUri()));
assertEquals("Get a wrong endpoint uri of http2", "http://www.google.com?proxyAuthHost=www.otherproxy.com&proxyAuthPort=2345&test=parameter", URISupport.normalizeUri(http2.getEndpointUri()));
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpQueryTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpQueryTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryTest.java
index 93251e2..932421b 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpQueryTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpQueryTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -28,7 +28,7 @@ import org.junit.Test;
public class HttpQueryTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -56,7 +56,7 @@ public class HttpQueryTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void httpQuery() throws Exception {
Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/?hl=en&q=camel", new Processor() {
@@ -77,7 +77,7 @@ public class HttpQueryTest extends BaseHttpTest {
assertExchange(exchange);
}
-
+
@Test
public void httpQueryWithEscapedCharacter() throws Exception {
Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/test/?my=%40%20camel", new Processor() {
@@ -87,7 +87,7 @@ public class HttpQueryTest extends BaseHttpTest {
assertExchange(exchange);
}
-
+
@Test
public void httpQueryWithUsernamePassword() throws Exception {
Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/user/pass?password=baa&username=foo", new Processor() {
@@ -97,4 +97,4 @@ public class HttpQueryTest extends BaseHttpTest {
assertExchange(exchange);
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpRedirectTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRedirectTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpRedirectTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpRedirectTest.java
index a6569e1..af7bae0 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpRedirectTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRedirectTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.camel.http.common.HttpOperationFailedException;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
@@ -40,7 +40,7 @@ import org.junit.Test;
public class HttpRedirectTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -67,7 +67,7 @@ public class HttpRedirectTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void httpRedirect() throws Exception {
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java
index c55044d..21356c6 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
@@ -39,10 +39,10 @@ public class HttpReferenceParameterTest extends CamelTestSupport {
@BindToRegistry("customBinding")
private TestHttpBinding testBinding;
-
+
@BindToRegistry("customConfigurer")
private TestClientConfigurer testConfigurer;
-
+
@BindToRegistry("customContext")
private HttpContext testHttpContext;
@@ -94,4 +94,4 @@ public class HttpReferenceParameterTest extends CamelTestSupport {
public void configureHttpClient(HttpClientBuilder clientBuilder) {
}
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSNIHostNameTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSNIHostNameTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSNIHostNameTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpSNIHostNameTest.java
index abdbbb0..3a2182c 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSNIHostNameTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSNIHostNameTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.http.common.HttpOperationFailedException;
@@ -58,7 +58,7 @@ public class HttpSNIHostNameTest extends CamelSpringTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
ClassPathXmlApplicationContext ctx =
- new ClassPathXmlApplicationContext(new String[]{"org/apache/camel/component/http4/CamelHttp4Context.xml"});
+ new ClassPathXmlApplicationContext(new String[]{"org/apache/camel/component/http/CamelHttpContext.xml"});
return ctx;
}
}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java
index 9f3c0ef..ba7fd2a 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.DelayValidationHandler;
+import org.apache.camel.component.http.handler.DelayValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -28,7 +28,7 @@ import org.junit.Test;
public class HttpSOTimeoutTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -53,7 +53,7 @@ public class HttpSOTimeoutTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void httpGet() throws Exception {
Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "?httpClient.SocketTimeout=5000", new Processor() {
@@ -94,4 +94,4 @@ public class HttpSOTimeoutTest extends BaseHttpTest {
assertNotNull("Should have thrown an exception", e);
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSendDynamicAwareTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSendDynamicAwareTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareTest.java
index 8a2f475..61077a3 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSendDynamicAwareTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSendDynamicAwareTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.handler.DrinkValidationHandler;
+import org.apache.camel.component.http.handler.DrinkValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -82,7 +82,7 @@ public class HttpSendDynamicAwareTest extends BaseHttpTest {
boolean found = context.getEndpointMap().containsKey("http://localhost:" + localServer.getLocalPort() + "?throwExceptionOnFailure=false");
assertTrue("Should find static uri", found);
- // we only have 2xdirect and 1xhttp4
+ // we only have 2xdirect and 1xhttp
assertEquals(3, context.getEndpointMap().size());
}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpServerTestSupport.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpServerTestSupport.java
index c7b7a84..ede6d97 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpServerTestSupport.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import javax.net.ssl.SSLContext;
@@ -79,4 +79,4 @@ public abstract class HttpServerTestSupport extends CamelTestSupport {
protected SSLContext getSSLContext() throws Exception {
return null;
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java
index b7a151c..cb829b8 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpThrowExceptionOnFailureTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpThrowExceptionOnFailureTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.camel.http.common.HttpOperationFailedException;
import org.apache.http.HttpStatus;
import org.apache.http.impl.bootstrap.HttpServer;
@@ -33,7 +33,7 @@ import org.junit.Test;
public class HttpThrowExceptionOnFailureTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -58,7 +58,7 @@ public class HttpThrowExceptionOnFailureTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void httpGetWhichReturnsHttp501() throws Exception {
Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/XXX?throwExceptionOnFailure=false", new Processor() {
@@ -88,10 +88,10 @@ public class HttpThrowExceptionOnFailureTest extends BaseHttpTest {
HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, e);
assertEquals(501, cause.getStatusCode());
}
-
+
@Test
public void httpGetWhichReturnsHttp501WithIgnoreResponseBody() throws Exception {
- Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":"
+ Exchange exchange = template.request("http://" + localServer.getInetAddress().getHostName() + ":"
+ localServer.getLocalPort() + "/XXX?throwExceptionOnFailure=false&ignoreResponseBody=true", new Processor() {
public void process(Exchange exchange) throws Exception {
}
@@ -110,7 +110,7 @@ public class HttpThrowExceptionOnFailureTest extends BaseHttpTest {
@Test
public void httpGetWhichReturnsHttp501ShouldThrowAnExceptionWithIgnoreResponseBody() throws Exception {
- Exchange reply = template.request("http://" + localServer.getInetAddress().getHostName() + ":"
+ Exchange reply = template.request("http://" + localServer.getInetAddress().getHostName() + ":"
+ localServer.getLocalPort() + "/XXX?throwExceptionOnFailure=true&ignoreResponseBody=true", new Processor() {
public void process(Exchange exchange) throws Exception {
}
@@ -121,5 +121,5 @@ public class HttpThrowExceptionOnFailureTest extends BaseHttpTest {
HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, e);
assertEquals(501, cause.getStatusCode());
}
-
-}
\ No newline at end of file
+
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpWithHttpUriHeaderTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpWithHttpUriHeaderTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpWithHttpUriHeaderTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpWithHttpUriHeaderTest.java
index eef40ff..1158c84 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpWithHttpUriHeaderTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpWithHttpUriHeaderTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -28,7 +28,7 @@ import org.junit.Test;
public class HttpWithHttpUriHeaderTest extends BaseHttpTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -53,7 +53,7 @@ public class HttpWithHttpUriHeaderTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void notBridgeEndpointWithDefault() throws Exception {
@@ -64,4 +64,4 @@ public class HttpWithHttpUriHeaderTest extends BaseHttpTest {
});
assertExchange(exchange);
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsAuthenticationTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsAuthenticationTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
index 7388ef9..bf366bd 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsAuthenticationTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsAuthenticationTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.util.ArrayList;
import java.util.List;
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.AuthenticationValidationHandler;
+import org.apache.camel.component.http.handler.AuthenticationValidationHandler;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.http.HttpRequestInterceptor;
import org.apache.http.HttpResponseInterceptor;
@@ -43,13 +43,13 @@ public class HttpsAuthenticationTest extends BaseHttpsTest {
private String user = "camel";
private String password = "password";
private HttpServer localServer;
-
+
@BindToRegistry("x509HostnameVerifier")
private NoopHostnameVerifier hostnameVerifier = new NoopHostnameVerifier();
-
+
@BindToRegistry("sslContextParameters")
private SSLContextParameters sslContextParameters = new SSLContextParameters();
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -78,7 +78,7 @@ public class HttpsAuthenticationTest extends BaseHttpsTest {
@Test
public void httpsGetWithAuthentication() throws Exception {
- Exchange exchange = template.request("https://127.0.0.1:" + localServer.getLocalPort()
+ Exchange exchange = template.request("https://127.0.0.1:" + localServer.getLocalPort()
+ "/?authUsername=camel&authPassword=password&x509HostnameVerifier=#x509HostnameVerifier&sslContextParameters=#sslContextParameters", new Processor() {
public void process(Exchange exchange) throws Exception {
}
@@ -95,7 +95,7 @@ public class HttpsAuthenticationTest extends BaseHttpsTest {
responseInterceptors.add(new ResponseContent());
responseInterceptors.add(new ResponseBasicUnauthorized());
ImmutableHttpProcessor httpproc = new ImmutableHttpProcessor(requestInterceptors, responseInterceptors);
-
+
return httpproc;
}
}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
similarity index 95%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
index 973c5df..f450357 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsGetTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.impl.bootstrap.HttpServer;
@@ -31,13 +31,13 @@ import org.junit.Test;
public class HttpsGetTest extends BaseHttpsTest {
private HttpServer localServer;
-
+
@BindToRegistry("x509HostnameVerifier")
private NoopHostnameVerifier hostnameVerifier = new NoopHostnameVerifier();
-
+
@BindToRegistry("sslContextParameters")
private SSLContextParameters sslContextParameters = new SSLContextParameters();
-
+
@Before
@Override
public void setUp() throws Exception {
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsServerTestSupport.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpsServerTestSupport.java
index fc28782..6c3b8c8 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsServerTestSupport.java
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.File;
import java.io.FileInputStream;
import java.security.KeyStore;
-import java.security.SecureRandom;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManagerFactory;
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsSslContextParametersGetTest.java
similarity index 94%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpsSslContextParametersGetTest.java
index ff6a6c9..9816f47 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsSslContextParametersGetTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
import org.junit.After;
@@ -28,7 +28,7 @@ import org.junit.Test;
public class HttpsSslContextParametersGetTest extends HttpsGetTest {
private HttpServer localServer;
-
+
@Before
@Override
public void setUp() throws Exception {
@@ -58,7 +58,7 @@ public class HttpsSslContextParametersGetTest extends HttpsGetTest {
@Test
public void httpsGet() throws Exception {
- Exchange exchange = template.request("https://127.0.0.1:" + localServer.getLocalPort()
+ Exchange exchange = template.request("https://127.0.0.1:" + localServer.getLocalPort()
+ "/mail/?x509HostnameVerifier=x509HostnameVerifier&sslContextParameters=#sslContextParameters", new Processor() {
public void process(Exchange exchange) throws Exception {
}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
index f267a44..4df9ef6f 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoComponentsSslContextParametersGetTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
@@ -31,22 +31,22 @@ public class HttpsTwoComponentsSslContextParametersGetTest extends BaseHttpsTest
private int port2;
private HttpServer localServer;
-
+
@BindToRegistry("x509HostnameVerifier")
private NoopHostnameVerifier hostnameVerifier = new NoopHostnameVerifier();
-
+
@BindToRegistry("sslContextParameters")
private SSLContextParameters sslContextParameters = new SSLContextParameters();
-
+
@BindToRegistry("sslContextParameters2")
private SSLContextParameters sslContextParameters2 = new SSLContextParameters();
-
+
@BindToRegistry("https-foo")
private HttpComponent httpComponent = new HttpComponent();
-
+
@BindToRegistry("https-bar")
private HttpComponent httpComponent1 = new HttpComponent();
-
+
@Before
@Override
public void setUp() throws Exception {
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoDifferentSslContextParametersGetTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoDifferentSslContextParametersGetTest.java
index 931a9f7..b820a7a 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsTwoDifferentSslContextParametersGetTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
@@ -29,18 +29,18 @@ import org.junit.Test;
@Ignore("Now we support to set sslContextParameters on different endpoints")
public class HttpsTwoDifferentSslContextParametersGetTest extends BaseHttpsTest {
-
+
private HttpServer localServer;
-
+
@BindToRegistry("x509HostnameVerifier")
private NoopHostnameVerifier hostnameVerifier = new NoopHostnameVerifier();
-
+
@BindToRegistry("sslContextParameters")
private SSLContextParameters sslContextParameters = new SSLContextParameters();
-
+
@BindToRegistry("sslContextParameters2")
private SSLContextParameters sslContextParameters2 = new SSLContextParameters();
-
+
@Before
@Override
public void setUp() throws Exception {
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/ManagedHttpProducerPoolStatsTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/ManagedHttpProducerPoolStatsTest.java
similarity index 99%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/ManagedHttpProducerPoolStatsTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/ManagedHttpProducerPoolStatsTest.java
index 4d77e1e..23014ca 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/ManagedHttpProducerPoolStatsTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/ManagedHttpProducerPoolStatsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import java.io.IOException;
@@ -75,7 +75,7 @@ public class ManagedHttpProducerPoolStatsTest extends BaseHttpTest {
localServer.stop();
}
}
-
+
@Test
public void testPoolStats() throws Exception {
// turn on registering jmx always so the producer is also registered
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/UrlRewriteTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/UrlRewriteTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/UrlRewriteTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/UrlRewriteTest.java
index ca043ae..338465b 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/UrlRewriteTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/UrlRewriteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4;
+package org.apache.camel.component.http;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/AuthenticationValidationHandler.java b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/AuthenticationValidationHandler.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/handler/AuthenticationValidationHandler.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/handler/AuthenticationValidationHandler.java
index 5fca937..87cb92b 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/AuthenticationValidationHandler.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/AuthenticationValidationHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.handler;
+package org.apache.camel.component.http.handler;
import java.io.IOException;
@@ -52,4 +52,4 @@ public class AuthenticationValidationHandler extends BasicValidationHandler {
private String getExpectedCredential() {
return user + ":" + password;
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/BasicRawQueryValidationHandler.java b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/BasicRawQueryValidationHandler.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/handler/BasicRawQueryValidationHandler.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/handler/BasicRawQueryValidationHandler.java
index 1bfa41f..c3988da 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/BasicRawQueryValidationHandler.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/BasicRawQueryValidationHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.handler;
+package org.apache.camel.component.http.handler;
import java.io.IOException;
import java.net.URI;
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/BasicValidationHandler.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/handler/BasicValidationHandler.java
index b8f9a57..df44ade 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/BasicValidationHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.handler;
+package org.apache.camel.component.http.handler;
import java.io.IOException;
import java.net.URI;
@@ -93,4 +93,4 @@ public class BasicValidationHandler implements HttpRequestHandler {
return responseContent;
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/DelayValidationHandler.java b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/DelayValidationHandler.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/handler/DelayValidationHandler.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/handler/DelayValidationHandler.java
index 2a53651..63df89f 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/DelayValidationHandler.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/DelayValidationHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.handler;
+package org.apache.camel.component.http.handler;
import java.io.IOException;
@@ -44,4 +44,4 @@ public class DelayValidationHandler extends BasicValidationHandler {
super.handle(request, response, context);
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/DrinkValidationHandler.java b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/DrinkValidationHandler.java
similarity index 96%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/handler/DrinkValidationHandler.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/handler/DrinkValidationHandler.java
index 16d4b09..b5ea060 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/DrinkValidationHandler.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/DrinkValidationHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.handler;
+package org.apache.camel.component.http.handler;
import org.apache.http.HttpRequest;
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/HeaderValidationHandler.java b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/HeaderValidationHandler.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/handler/HeaderValidationHandler.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/handler/HeaderValidationHandler.java
index 953b263..3fb6f87 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/HeaderValidationHandler.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/HeaderValidationHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.handler;
+package org.apache.camel.component.http.handler;
import java.io.IOException;
import java.util.Map;
@@ -64,4 +64,4 @@ public class HeaderValidationHandler extends BasicValidationHandler {
super.handle(request, response, context);
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/ProxyAuthenticationValidationHandler.java b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/ProxyAuthenticationValidationHandler.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/handler/ProxyAuthenticationValidationHandler.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/handler/ProxyAuthenticationValidationHandler.java
index b1c06df..9f90765 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/ProxyAuthenticationValidationHandler.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/ProxyAuthenticationValidationHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.handler;
+package org.apache.camel.component.http.handler;
import java.io.IOException;
@@ -53,4 +53,4 @@ public class ProxyAuthenticationValidationHandler extends BasicValidationHandler
return user + ":" + password;
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/SessionReflectionHandler.java b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/SessionReflectionHandler.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/handler/SessionReflectionHandler.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/handler/SessionReflectionHandler.java
index 7a5e768..02d39d4 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/handler/SessionReflectionHandler.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/SessionReflectionHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.handler;
+package org.apache.camel.component.http.handler;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java
similarity index 98%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java
index d68bd9f..d4d78b4 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.helper;
+package org.apache.camel.component.http.helper;
import java.net.URI;
import java.net.URISyntaxException;
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.component.http4.HttpEndpoint;
+import org.apache.camel.component.http.HttpEndpoint;
import org.apache.camel.http.common.HttpHelper;
import org.apache.camel.http.common.HttpMethods;
import org.apache.camel.impl.DefaultCamelContext;
@@ -249,4 +249,4 @@ public class HttpHelperTest {
return endpoint;
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/rest/RestCamelComponentVerifierTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http/rest/RestCamelComponentVerifierTest.java
similarity index 97%
rename from components/camel-http/src/test/java/org/apache/camel/component/http4/rest/RestCamelComponentVerifierTest.java
rename to components/camel-http/src/test/java/org/apache/camel/component/http/rest/RestCamelComponentVerifierTest.java
index ba48215..19a0d59 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/rest/RestCamelComponentVerifierTest.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/rest/RestCamelComponentVerifierTest.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.rest;
+package org.apache.camel.component.http.rest;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.apache.camel.component.extension.ComponentVerifierExtension;
-import org.apache.camel.component.http4.BaseHttpTest;
-import org.apache.camel.component.http4.handler.BasicValidationHandler;
+import org.apache.camel.component.http.BaseHttpTest;
+import org.apache.camel.component.http.handler.BasicValidationHandler;
import org.apache.camel.component.rest.RestComponent;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;
@@ -175,4 +175,4 @@ public class RestCamelComponentVerifierTest extends BaseHttpTest {
Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http4/AdviceAndInterceptHttp4IssueTest.java b/components/camel-http/src/test/java/org/apache/camel/component/http4/AdviceAndInterceptHttp4IssueTest.java
deleted file mode 100644
index 49831d2..0000000
--- a/components/camel-http/src/test/java/org/apache/camel/component/http4/AdviceAndInterceptHttp4IssueTest.java
+++ /dev/null
@@ -1,95 +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.http4;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.AdviceWithRouteBuilder;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.reifier.RouteReifier;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-
-/**
- *
- */
-public class AdviceAndInterceptHttp4IssueTest extends CamelTestSupport {
-
- private String simpleProvider = "http:fakeHTTPADDRESS.com:80?throwExceptionOnFailure=false";
- private String providerWithParameter = "http:fakeHTTPADDRESS.com:80?throwExceptionOnFailure=false&httpClient.cookieSpec=ignoreCookies";
- private volatile boolean messageIntercepted;
-
- @Test
- public void testHttp4WithoutHttpClientParameter() throws Exception {
- doTestHttp4Parameter(simpleProvider);
- }
-
- @Test
- public void testHttp4WithHttpClientParameter() throws Exception {
- doTestHttp4Parameter(providerWithParameter);
- }
-
- @Override
- public boolean isUseAdviceWith() {
- return true;
- }
-
- @Override
- public boolean isUseRouteBuilder() {
- return true;
- }
-
- private void doTestHttp4Parameter(final String provider) throws Exception {
- messageIntercepted = false;
-
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:start")
- .to(provider)
- .to("mock:result");
- }
- });
-
- RouteReifier.adviceWith(context.getRouteDefinitions().get(0), context, new AdviceWithRouteBuilder() {
- @Override
- public void configure() throws Exception {
- interceptSendToEndpoint("http:fakeHTTPADDRESS.com:80*")
- .skipSendToOriginalEndpoint()
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- messageIntercepted = true;
- }
- })
- .to("mock:advised");
- }
- });
-
- context.start();
-
- getMockEndpoint("mock:advised").expectedMessageCount(1);
- getMockEndpoint("mock:result").expectedMessageCount(1);
-
- template.sendBody("direct:start", "Hello World");
-
- assertMockEndpointsSatisfied();
-
- assertTrue(messageIntercepted);
- }
-
-}
diff --git a/components/camel-http/src/test/resources/log4j2.properties b/components/camel-http/src/test/resources/log4j2.properties
index 4f6bfeb..f8a1df9 100644
--- a/components/camel-http/src/test/resources/log4j2.properties
+++ b/components/camel-http/src/test/resources/log4j2.properties
@@ -17,7 +17,7 @@
appender.file.type = File
appender.file.name = file
-appender.file.fileName = target/camel-http4-test.log
+appender.file.fileName = target/camel-http-test.log
appender.file.layout.type = PatternLayout
appender.file.layout.pattern = %d %-5p %c{1} - %m %n
appender.out.type = Console
diff --git a/components/camel-http/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml b/components/camel-http/src/test/resources/org/apache/camel/component/http/CamelHttp4Context.xml
similarity index 94%
rename from components/camel-http/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
rename to components/camel-http/src/test/resources/org/apache/camel/component/http/CamelHttp4Context.xml
index b9ddfe9..bb1c7d3 100644
--- a/components/camel-http/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
+++ b/components/camel-http/src/test/resources/org/apache/camel/component/http/CamelHttp4Context.xml
@@ -47,15 +47,15 @@
</camel:clientParameters>
</camel:sslContextParameters>
- <bean id="https4" class="org.apache.camel.component.http4.HttpComponent">
+ <bean id="https4" class="org.apache.camel.component.http.HttpComponent">
<property name="sslContextParameters" ref="correctSniSslContextParameters"/>
</bean>
- <bean id="https4-no" class="org.apache.camel.component.http4.HttpComponent">
+ <bean id="https4-no" class="org.apache.camel.component.http.HttpComponent">
<property name="sslContextParameters" ref="noSniSslContextParameters"/>
</bean>
- <bean id="https4-wrong" class="org.apache.camel.component.http4.HttpComponent">
+ <bean id="https4-wrong" class="org.apache.camel.component.http.HttpComponent">
<property name="sslContextParameters" ref="wrongSniSslContextParameters"/>
</bean>
diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc
index e45e937..05a43f0 100644
--- a/components/camel-jetty/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty/src/main/docs/jetty-component.adoc
@@ -228,7 +228,7 @@ The component supports 35 options, which are listed below.
== Message Headers
Camel uses the same message headers as the xref:http-component.adoc[HTTP]
-component.
+component.
It also uses (Exchange.HTTP_CHUNKED,CamelHttpChunked)
header to turn on or turn off the chuched encoding on the camel-jetty
consumer.
@@ -516,7 +516,7 @@ internally.
== Default behavior for returning HTTP status codes
The default behavior of HTTP status codes is defined by the
-`org.apache.camel.component.http4.DefaultHttpBinding` class, which
+`org.apache.camel.component.http.DefaultHttpBinding` class, which
handles how a response is written and also sets the HTTP status code.
If the exchange was processed successfully, the 200 HTTP status code is
@@ -529,7 +529,7 @@ specify which HTTP status code to return, set the code in the
== Customizing HttpBinding
By default, Camel uses the
-`org.apache.camel.component.http4.DefaultHttpBinding` to handle how a
+`org.apache.camel.component.http.DefaultHttpBinding` to handle how a
response is written. If you like, you can customize this behavior either
by implementing your own `HttpBinding` class or by extending
`DefaultHttpBinding` and overriding the appropriate methods.
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
index 8154f70..418ea10 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
@@ -83,7 +83,7 @@ public class HttpAuthMethodPriorityTest extends BaseJettyTest {
} catch (FailedToCreateProducerException e) {
IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause().getCause().getCause());
// JAXB 2.2 uses a slightly different message
- boolean b = cause.getMessage().contains("No enum const") && cause.getMessage().contains("org.apache.camel.component.http4.AuthMethod.foo");
+ boolean b = cause.getMessage().contains("No enum const") && cause.getMessage().contains("org.apache.camel.component.http.AuthMethod.foo");
assertTrue("Bad fault message: " + cause.getMessage(), b);
}
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
index 63d07cb..57c896f 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpComponent;
+import org.apache.camel.component.http.HttpComponent;
import org.apache.camel.http.common.HttpConfiguration;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingMapHttpMessageFormUrlEncodedFalseBodyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingMapHttpMessageFormUrlEncodedFalseBodyTest.java
index ca75961..56ea015 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingMapHttpMessageFormUrlEncodedFalseBodyTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingMapHttpMessageFormUrlEncodedFalseBodyTest.java
@@ -22,11 +22,11 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpMethods;
+import org.apache.camel.component.http.HttpMethods;
import org.junit.Test;
public class HttpBindingMapHttpMessageFormUrlEncodedFalseBodyTest extends BaseJettyTest {
-
+
@Test
public void testSendToJetty() throws Exception {
Map<String, Object> map = new HashMap<>();
@@ -42,14 +42,14 @@ public class HttpBindingMapHttpMessageFormUrlEncodedFalseBodyTest extends BaseJe
from("jetty:http://localhost:{{port}}/myapp/myservice?mapHttpMessageFormUrlEncodedBody=false").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
-
+
// for unit testing make sure we got right message
assertEquals("The body message is wrong", "b1=x&b2=y", body);
assertEquals("Get a wrong query parameter from the message header", "a", exchange.getIn().getHeader("query1"));
assertEquals("Get a wrong query parameter from the message header", "b", exchange.getIn().getHeader("query2"));
assertNotEquals("Get a wrong form parameter from the message header", "x", exchange.getIn().getHeader("b1"));
assertNotEquals("Get a wrong form parameter from the message header", "y", exchange.getIn().getHeader("b2"));
-
+
// send a response
exchange.getOut().setBody("Request message is OK");
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingPreservePostFormUrlEncodedBodyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingPreservePostFormUrlEncodedBodyTest.java
index 27a2fec..9965c80 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingPreservePostFormUrlEncodedBodyTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingPreservePostFormUrlEncodedBodyTest.java
@@ -19,11 +19,11 @@ package org.apache.camel.component.jetty;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpMethods;
+import org.apache.camel.component.http.HttpMethods;
import org.junit.Test;
public class HttpBindingPreservePostFormUrlEncodedBodyTest extends BaseJettyTest {
-
+
@Test
public void testSendToJetty() throws Exception {
Exchange exchange = template.request("http://localhost:{{port}}/myapp/myservice?query1=a&query2=b", new Processor() {
@@ -33,7 +33,7 @@ public class HttpBindingPreservePostFormUrlEncodedBodyTest extends BaseJettyTest
exchange.getIn().setHeader("content-type", "application/x-www-form-urlencoded");
exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.POST);
}
-
+
});
// convert the response to a String
String body = exchange.getOut().getBody(String.class);
@@ -47,14 +47,14 @@ public class HttpBindingPreservePostFormUrlEncodedBodyTest extends BaseJettyTest
from("jetty:http://localhost:{{port}}/myapp/myservice?map").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
-
+
// for unit testing make sure we got right message
assertEquals("The body message is wrong", "b1=x&b2=y", body);
assertEquals("Get a wrong query parameter from the message header", "a", exchange.getIn().getHeader("query1"));
assertEquals("Get a wrong query parameter from the message header", "b", exchange.getIn().getHeader("query2"));
assertEquals("Get a wrong form parameter from the message header", "x", exchange.getIn().getHeader("b1"));
assertEquals("Get a wrong form parameter from the message header", "y", exchange.getIn().getHeader("b2"));
-
+
// send a response
exchange.getOut().setBody("Request message is OK");
}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java
index fa67268..b9e0eb2 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.attachment.AttachmentMessage;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpEndpoint;
+import org.apache.camel.component.http.HttpEndpoint;
import org.apache.camel.support.DefaultHeaderFilterStrategy;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.PostMethod;
@@ -49,23 +49,23 @@ public class HttpBridgeMultipartRouteTest extends BaseJettyTest {
setOutFilterPattern("(?i)(Camel|org\\.apache\\.camel)[\\.|a-z|A-z|0-9]*");
}
}
-
+
@Test
public void testHttpClient() throws Exception {
File jpg = new File("src/test/resources/java.jpg");
String body = "TEST";
Part[] parts = new Part[] {new StringPart("body", body), new FilePart(jpg.getName(), jpg)};
-
+
PostMethod method = new PostMethod("http://localhost:" + port2 + "/test/hello");
MultipartRequestEntity requestEntity = new MultipartRequestEntity(parts, method.getParams());
method.setRequestEntity(requestEntity);
-
+
HttpClient client = new HttpClient();
client.executeMethod(method);
-
+
String responseBody = method.getResponseBodyAsString();
assertEquals(body, responseBody);
-
+
String numAttachments = method.getResponseHeader("numAttachments").getValue();
assertEquals(numAttachments, "2");
}
@@ -87,16 +87,16 @@ public class HttpBridgeMultipartRouteTest extends BaseJettyTest {
exchange.getOut().setBody(in.getHeader("body"));
}
};
-
+
HttpEndpoint epOut = getContext().getEndpoint("http://localhost:" + port1 + "?bridgeEndpoint=true&throwExceptionOnFailure=false", HttpEndpoint.class);
epOut.setHeaderFilterStrategy(new MultipartHeaderFilterStrategy());
-
+
from("jetty:http://localhost:" + port2 + "/test/hello?enableMultipartFilter=false")
.to(epOut);
-
+
from("jetty://http://localhost:" + port1 + "?matchOnUriPrefix=true").process(serviceProc);
}
};
- }
+ }
-}
\ No newline at end of file
+}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/Http4DeleteWithBodyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpDeleteWithBodyTest.java
similarity index 91%
rename from components/camel-jetty/src/test/java/org/apache/camel/component/jetty/Http4DeleteWithBodyTest.java
rename to components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpDeleteWithBodyTest.java
index bdf1497..7b94948 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/Http4DeleteWithBodyTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpDeleteWithBodyTest.java
@@ -21,17 +21,17 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
-public class Http4DeleteWithBodyTest extends BaseJettyTest {
+public class HttpDeleteWithBodyTest extends BaseJettyTest {
@Test
- public void testHttp4DeleteWithBodyFalseTest() throws Exception {
+ public void testHttpDeleteWithBodyFalseTest() throws Exception {
byte[] data = "World".getBytes();
String out = template.requestBodyAndHeader("http://localhost:{{port}}/test", data, Exchange.HTTP_METHOD, "DELETE", String.class);
assertEquals("Bye ", out);
}
@Test
- public void testHttp4DeleteWithBodyTrueTest() throws Exception {
+ public void testHttpDeleteWithBodyTrueTest() throws Exception {
byte[] data = "World".getBytes();
String out = template.requestBodyAndHeader("http://localhost:{{port}}/test?deleteWithBody=true", data, Exchange.HTTP_METHOD, "DELETE", String.class);
assertEquals("Bye World", out);
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
index c32adb9..db155fc 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpClientConfigurer;
+import org.apache.camel.component.http.HttpClientConfigurer;
import org.apache.camel.spi.Registry;
import org.apache.http.impl.client.HttpClientBuilder;
import org.junit.Ignore;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java
index 7b0062c..60fb59c 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpComponent;
+import org.apache.camel.component.http.HttpComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
@@ -47,11 +47,11 @@ public class MultiThreadedHttpGetTest extends BaseJettyTest {
// This is needed as by default there are 2 parallel
// connections to some host and there is nothing that
// closes the http connection here.
- // Need to set the httpConnectionManager
+ // Need to set the httpConnectionManager
PoolingHttpClientConnectionManager httpConnectionManager = new PoolingHttpClientConnectionManager();
httpConnectionManager.setDefaultMaxPerRoute(5);
context.getComponent("http", HttpComponent.class).setClientConnectionManager(httpConnectionManager);
-
+
String endpointName = "seda:withoutConversion?concurrentConsumers=5";
sendMessagesTo(endpointName, 5);
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java
index becaebc..343f725 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpComponent;
+import org.apache.camel.component.http.HttpComponent;
import org.apache.camel.component.jetty.BaseJettyTest;
import org.apache.camel.http.common.HttpCommonComponent;
import org.apache.camel.http.common.HttpConstants;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerGetTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerGetTest.java
deleted file mode 100644
index 0479c7c..0000000
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerGetTest.java
+++ /dev/null
@@ -1,60 +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.jetty.rest.producer;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jetty.BaseJettyTest;
-import org.junit.Test;
-
-public class Http4RestProducerGetTest extends BaseJettyTest {
-
- @Test
- public void testHttp4ProducerGet() throws Exception {
- String out = fluentTemplate.withHeader("id", "123").to("direct:start").request(String.class);
- assertEquals("123;Donald Duck", out);
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- restConfiguration().component("jetty").host("localhost").port(getPort())
- // use camel-http as rest client
- .producerComponent("http");
-
- from("direct:start")
- .to("rest:get:users/{id}/basic");
-
- // use the rest DSL to define the rest services
- rest("/users/")
- .get("{id}/basic")
- .route()
- .to("mock:input")
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- String id = exchange.getIn().getHeader("id", String.class);
- exchange.getOut().setBody(id + ";Donald Duck");
- }
- });
- }
- };
- }
-
-}
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerPutTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerPutTest.java
deleted file mode 100644
index 8d3cbb1..0000000
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/Http4RestProducerPutTest.java
+++ /dev/null
@@ -1,53 +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.jetty.rest.producer;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jetty.BaseJettyTest;
-import org.junit.Test;
-
-public class Http4RestProducerPutTest extends BaseJettyTest {
-
- @Test
- public void testHttp4ProducerPut() throws Exception {
- getMockEndpoint("mock:input").expectedMessageCount(1);
-
- fluentTemplate.withBody("Donald Duck").withHeader("id", "123").to("direct:start").send();
-
- assertMockEndpointsSatisfied();
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- // configure to use localhost with the given port
- restConfiguration().producerComponent("http").component("jetty").host("localhost").port(getPort());
-
- from("direct:start")
- .to("rest:put:users/{id}");
-
- // use the rest DSL to define the rest services
- rest("/users/")
- .put("{id}")
- .to("mock:input");
- }
- };
- }
-
-}
diff --git a/components/camel-netty-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
index 75fe84f..a600c26 100644
--- a/components/camel-netty-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
@@ -20,7 +20,7 @@ import io.netty.handler.codec.http.FullHttpRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpMethods;
+import org.apache.camel.component.http.HttpMethods;
import org.junit.Test;
diff --git a/components/camel-netty-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
index 482b88b..76eb99c 100644
--- a/components/camel-netty-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
@@ -20,7 +20,7 @@ import io.netty.handler.codec.http.FullHttpRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpMethods;
+import org.apache.camel.component.http.HttpMethods;
import org.junit.Test;
diff --git a/components/camel-netty-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
index a6a7cf3..9e70a7b 100644
--- a/components/camel-netty-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
@@ -20,7 +20,7 @@ import io.netty.handler.codec.http.FullHttpRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpMethods;
+import org.apache.camel.component.http.HttpMethods;
import org.junit.Test;
diff --git a/components/camel-netty-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
index 1864bd7..4556b9f 100644
--- a/components/camel-netty-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
@@ -20,7 +20,7 @@ import io.netty.handler.codec.http.FullHttpRequest;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpMethods;
+import org.apache.camel.component.http.HttpMethods;
import org.junit.Test;
diff --git a/components/camel-properties/src/main/docs/properties-component.adoc b/components/camel-properties/src/main/docs/properties-component.adoc
index 83dbb0a..df6a525 100644
--- a/components/camel-properties/src/main/docs/properties-component.adoc
+++ b/components/camel-properties/src/main/docs/properties-component.adoc
@@ -89,13 +89,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 13 options, which are listed below.
+The component supports 14 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.properties.auto-discover-properties-sources* | Whether to automatically discovery instances of PropertiesSource from registry and service factory. | true | Boolean
| *camel.component.properties.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
| *camel.component.properties.default-fallback-enabled* | If false, the component does not attempt to find a default for the key by looking after the colon separator. | true | Boolean
| *camel.component.properties.enabled* | Whether to enable auto configuration of the properties component. This is enabled by default. | | Boolean
diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java
index 034d4e0..d693dbf 100644
--- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java
+++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpMethods;
+import org.apache.camel.component.http.HttpMethods;
import org.apache.camel.model.rest.RestBindingMode;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/PreservePostFormUrlEncodedBodyTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/PreservePostFormUrlEncodedBodyTest.java
index 6c706ddb..4e3e0e8 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/PreservePostFormUrlEncodedBodyTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/PreservePostFormUrlEncodedBodyTest.java
@@ -21,11 +21,11 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpMethods;
+import org.apache.camel.component.http.HttpMethods;
import org.junit.Test;
public class PreservePostFormUrlEncodedBodyTest extends BaseUndertowTest {
-
+
@Test
public void testSendToUndertow() throws Exception {
Exchange exchange = template.request("http://localhost:{{port}}/myapp/myservice?query1=a&query2=b", new Processor() {
@@ -35,7 +35,7 @@ public class PreservePostFormUrlEncodedBodyTest extends BaseUndertowTest {
exchange.getIn().setHeader("content-type", "application/x-www-form-urlencoded");
exchange.getIn().setHeader(Exchange.HTTP_METHOD, HttpMethods.POST);
}
-
+
});
// convert the response to a String
String body = exchange.getOut().getBody(String.class);
@@ -49,7 +49,7 @@ public class PreservePostFormUrlEncodedBodyTest extends BaseUndertowTest {
from("undertow:http://localhost:{{port}}/myapp/myservice?map").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Map body = exchange.getIn().getBody(Map.class);
-
+
// for unit testing make sure we got right message
assertNotNull(body);
assertEquals("x", body.get("b1"));
@@ -58,7 +58,7 @@ public class PreservePostFormUrlEncodedBodyTest extends BaseUndertowTest {
assertEquals("b", exchange.getIn().getHeader("query2"));
assertEquals("x", exchange.getIn().getHeader("b1"));
assertEquals("y", exchange.getIn().getHeader("b2"));
-
+
// send a response
exchange.getOut().setBody("Request message is OK");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index f60c71b..7e3445e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -1539,7 +1539,7 @@ public class SimpleTest extends LanguageTestSupport {
public void testBodyOgnlReplaceFirst() throws Exception {
exchange.getIn().setBody("http:camel.apache.org");
- assertExpression("${body.replaceFirst('http:', 'http4:')}", "http4:camel.apache.org");
+ assertExpression("${body.replaceFirst('http:', 'https:')}", "https:camel.apache.org");
assertExpression("${body.replaceFirst('http:', '')}", "camel.apache.org");
assertExpression("${body.replaceFirst('http:', ' ')}", " camel.apache.org");
assertExpression("${body.replaceFirst('http:', ' ')}", " camel.apache.org");
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
index 07a8541..0fcaa60 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
@@ -413,7 +413,7 @@ public interface HttpEndpointBuilderFactory {
* mechanisms etc.
*
* The option is a:
- * <code>org.apache.camel.component.http4.HttpClientConfigurer</code>
+ * <code>org.apache.camel.component.http.HttpClientConfigurer</code>
* type.
*
* Group: advanced
@@ -429,7 +429,7 @@ public interface HttpEndpointBuilderFactory {
* mechanisms etc.
*
* The option will be converted to a
- * <code>org.apache.camel.component.http4.HttpClientConfigurer</code>
+ * <code>org.apache.camel.component.http.HttpClientConfigurer</code>
* type.
*
* Group: advanced
diff --git a/docs/components/modules/ROOT/pages/http-component.adoc b/docs/components/modules/ROOT/pages/http-component.adoc
index ea7ae44..809cedb 100644
--- a/docs/components/modules/ROOT/pages/http-component.adoc
+++ b/docs/components/modules/ROOT/pages/http-component.adoc
@@ -195,7 +195,7 @@ The component supports 20 options, which are listed below.
| *camel.component.http.enabled* | Whether to enable auto configuration of the http component. This is enabled by default. | | Boolean
| *camel.component.http.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. | | String
| *camel.component.http.http-binding* | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. The option is a org.apache.camel.http.common.HttpBinding type. | | String
-| *camel.component.http.http-client-configurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. The option is a org.apache.camel.component.http4.HttpClientConfigurer type. | | String
+| *camel.component.http.http-client-configurer* | To use the custom HttpClientConfigurer to perform configuration of the HttpClient that will be used. The option is a org.apache.camel.component.http.HttpClientConfigurer type. | | String
| *camel.component.http.http-configuration* | To use the shared HttpConfiguration as base configuration. The option is a org.apache.camel.http.common.HttpConfiguration type. | | String
| *camel.component.http.http-context* | To use a custom org.apache.http.protocol.HttpContext when executing requests. The option is a org.apache.http.protocol.HttpContext type. | | String
| *camel.component.http.max-total-connections* | The maximum number of connections. | 200 | Integer
@@ -252,7 +252,7 @@ body. All headers from the IN message will be copied to the OUT message,
so headers are preserved during routing. Additionally Camel will add the
HTTP response headers as well to the OUT message headers.
-
+
== Using System Properties
@@ -396,7 +396,7 @@ setting the message header. Here is an example:
[source,java]
-----------------------------------------------------------------------------------------------
from("direct:start")
- .setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http4.HttpMethods.POST))
+ .setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http.HttpMethods.POST))
.to("http://www.google.com")
.to("mock:results");
-----------------------------------------------------------------------------------------------
@@ -427,7 +427,7 @@ And the equivalent Spring sample:
== Using client timeout - SO_TIMEOUT
See the
-https://github.com/apache/camel/blob/master/components/camel-http/src/test/java/org/apache/camel/component/http4/HttpSOTimeoutTest.java[HttpSOTimeoutTest]
+https://github.com/apache/camel/blob/master/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java[HttpSOTimeoutTest]
unit test.
== Configuring a Proxy
@@ -611,10 +611,10 @@ http://hc.apache.org/httpcomponents-client-ga/[Apache HttpClient].
Please refer to
http://hc.apache.org/httpcomponents-client-ga/tutorial/html/connmgmt.html#d4e537[SSL/TLS
customization] for details or have a look into the
-`org.apache.camel.component.http4.HttpsServerTestSupport` unit test base
+`org.apache.camel.component.http.HttpsServerTestSupport` unit test base
class. +
You can also implement a custom
-`org.apache.camel.component.http4.HttpClientConfigurer` to do some
+`org.apache.camel.component.http.HttpClientConfigurer` to do some
configuration on the http client if you need full control of it.
However if you _just_ want to specify the keystore and truststore you
@@ -713,12 +713,12 @@ property.
[source,xml]
----------------------------------------------------------------------------
-<bean id="http-foo" class="org.apache.camel.component.http4.HttpComponent">
+<bean id="http-foo" class="org.apache.camel.component.http.HttpComponent">
<property name="sslContextParameters" ref="sslContextParams1"/>
<property name="x509HostnameVerifier" ref="hostnameVerifier"/>
</bean>
-<bean id="http-bar" class="org.apache.camel.component.http4.HttpComponent">
+<bean id="http-bar" class="org.apache.camel.component.http.HttpComponent">
<property name="sslContextParameters" ref="sslContextParams2"/>
<property name="x509HostnameVerifier" ref="hostnameVerifier"/>
</bean>
diff --git a/docs/components/modules/ROOT/pages/jetty-component.adoc b/docs/components/modules/ROOT/pages/jetty-component.adoc
index e45e937..05a43f0 100644
--- a/docs/components/modules/ROOT/pages/jetty-component.adoc
+++ b/docs/components/modules/ROOT/pages/jetty-component.adoc
@@ -228,7 +228,7 @@ The component supports 35 options, which are listed below.
== Message Headers
Camel uses the same message headers as the xref:http-component.adoc[HTTP]
-component.
+component.
It also uses (Exchange.HTTP_CHUNKED,CamelHttpChunked)
header to turn on or turn off the chuched encoding on the camel-jetty
consumer.
@@ -516,7 +516,7 @@ internally.
== Default behavior for returning HTTP status codes
The default behavior of HTTP status codes is defined by the
-`org.apache.camel.component.http4.DefaultHttpBinding` class, which
+`org.apache.camel.component.http.DefaultHttpBinding` class, which
handles how a response is written and also sets the HTTP status code.
If the exchange was processed successfully, the 200 HTTP status code is
@@ -529,7 +529,7 @@ specify which HTTP status code to return, set the code in the
== Customizing HttpBinding
By default, Camel uses the
-`org.apache.camel.component.http4.DefaultHttpBinding` to handle how a
+`org.apache.camel.component.http.DefaultHttpBinding` to handle how a
response is written. If you like, you can customize this behavior either
by implementing your own `HttpBinding` class or by extending
`DefaultHttpBinding` and overriding the appropriate methods.
diff --git a/docs/components/modules/ROOT/pages/properties-component.adoc b/docs/components/modules/ROOT/pages/properties-component.adoc
index 71bdf2e..df6a525 100644
--- a/docs/components/modules/ROOT/pages/properties-component.adoc
+++ b/docs/components/modules/ROOT/pages/properties-component.adoc
@@ -15,7 +15,7 @@ Where *key* is the key for the property to lookup
== Options
// component options: START
-The Properties component supports 12 options, which are listed below.
+The Properties component supports 13 options, which are listed below.
@@ -32,6 +32,7 @@ The Properties component supports 12 options, which are listed below.
| *overrideProperties* (advanced) | Sets a special list of override properties that take precedence and will use first, if a property exist. | | Properties
| *systemPropertiesMode* (common) | Sets the JVM system property mode (0 = never, 1 = fallback, 2 = override). The default mode (override) is to use system properties if present, and override any existing properties. OS environment variable mode is checked before JVM system property mode | 2 | int
| *environmentVariableMode* (common) | Sets the OS environment variables mode (0 = never, 1 = fallback, 2 = override). The default mode (override) is to use OS environment variables if present, and override any existing properties. OS environment variable mode is checked before JVM system property mode | 2 | int
+| *autoDiscoverProperties Sources* (common) | Whether to automatically discovery instances of PropertiesSource from registry and service factory. | true | boolean
| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
|===
@@ -88,13 +89,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 13 options, which are listed below.
+The component supports 14 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *camel.component.properties.auto-discover-properties-sources* | Whether to automatically discovery instances of PropertiesSource from registry and service factory. | true | Boolean
| *camel.component.properties.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
| *camel.component.properties.default-fallback-enabled* | If false, the component does not attempt to find a default for the key by looking after the colon separator. | true | Boolean
| *camel.component.properties.enabled* | Whether to enable auto configuration of the properties component. This is enabled by default. | | Boolean
diff --git a/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc b/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc
index 522b71b..a63bbd8 100644
--- a/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc
+++ b/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc
@@ -33,7 +33,7 @@ It is also possible to have a session on an xref:endpoint.adoc[Endpoint]
entity. This would mean that all invocations of an HTTP call issued by a
single Endpoint share a session, whereas different Endpoints never share
sessions, even if the call is sent to the same server.
-Some components like camel-http, and camel-http4 support endpoint scoped
+Some components like camel-http, and camel-http support endpoint scoped
sessions even prior to version 2.19.
[[HTTP-SessionHandling-ExchangeScope]]
diff --git a/docs/user-manual/modules/ROOT/pages/http-session.adoc b/docs/user-manual/modules/ROOT/pages/http-session.adoc
index 8c04d78..766e3bf 100644
--- a/docs/user-manual/modules/ROOT/pages/http-session.adoc
+++ b/docs/user-manual/modules/ROOT/pages/http-session.adoc
@@ -31,7 +31,7 @@ Endpoint entity. This would mean that all invocations of
an HTTP call issued by a single Endpoint share a session, whereas different
Endpoints never share sessions, even if the call is sent to the same server.
-Some components like camel-http, and camel-http4 support endpoint scoped sessions
+Some components like camel-http, and camel-http support endpoint scoped sessions
even prior to version 2.19.
[[HTTPSession-ExchangeScope]]
diff --git a/docs/user-manual/modules/ROOT/pages/karaf.adoc b/docs/user-manual/modules/ROOT/pages/karaf.adoc
index 367028a..2c01e09 100644
--- a/docs/user-manual/modules/ROOT/pages/karaf.adoc
+++ b/docs/user-manual/modules/ROOT/pages/karaf.adoc
@@ -98,7 +98,6 @@ karaf@root> features:list|grep -i camel
[uninstalled] [2.8.0 ] camel-castor repo-0
[uninstalled] [2.8.0 ] camel-crypto repo-0
[uninstalled] [2.8.0 ] camel-http repo-0
-[uninstalled] [2.8.0 ] camel-http4 repo-0
[uninstalled] [2.8.0 ] camel-mina repo-0
[uninstalled] [2.8.0 ] camel-jetty repo-0
[uninstalled] [2.8.0 ] camel-servlet repo-0
diff --git a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
similarity index 98%
rename from platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
index a385749..6f47076 100644
--- a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.springboot;
+package org.apache.camel.component.http.springboot;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Generated;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.http4.HttpComponent;
+import org.apache.camel.component.http.HttpComponent;
import org.apache.camel.spi.ComponentCustomizer;
import org.apache.camel.spi.HasId;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
diff --git a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
similarity index 98%
rename from platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java
rename to platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
index fbe40a1..b7e8202 100644
--- a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.http4.springboot;
+package org.apache.camel.component.http.springboot;
import javax.annotation.Generated;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
@@ -39,7 +39,7 @@ public class HttpComponentConfiguration
/**
* To use the custom HttpClientConfigurer to perform configuration of the
* HttpClient that will be used. The option is a
- * org.apache.camel.component.http4.HttpClientConfigurer type.
+ * org.apache.camel.component.http.HttpClientConfigurer type.
*/
private String httpClientConfigurer;
/**
diff --git a/platforms/spring-boot/components-starter/camel-http-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-http-starter/src/main/resources/META-INF/spring.factories
index fb79144..33cea5f 100644
--- a/platforms/spring-boot/components-starter/camel-http-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-http-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,4 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.http4.springboot.HttpComponentAutoConfiguration
+org.apache.camel.component.http.springboot.HttpComponentAutoConfiguration
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java
deleted file mode 100644
index 1c183dc..0000000
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java
+++ /dev/null
@@ -1,82 +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.itest.http;
-import java.io.IOException;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.http.Consts;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpRequestHandler;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-
-@ContextConfiguration
-public class Http4EndpointTest extends AbstractJUnit4SpringContextTests {
- protected static HttpTestServer localServer;
-
- @Autowired
- protected CamelContext camelContext;
-
- @EndpointInject("direct:start")
- protected ProducerTemplate producer;
-
- @EndpointInject("mock:result")
- protected MockEndpoint mock;
-
-
-
- @BeforeClass
- public static void setUp() throws Exception {
- localServer = new HttpTestServer(null, null);
- localServer.register("/", new HttpRequestHandler() {
- public void handle(HttpRequest request, HttpResponse response,
- HttpContext context) throws HttpException, IOException {
- response.setStatusCode(HttpStatus.SC_OK);
- response.setEntity(new StringEntity("OK", Consts.ISO_8859_1));
- }
- });
- localServer.start();
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- if (localServer != null) {
- localServer.stop();
- }
- }
-
- @Test
- public void testMocksIsValid() throws Exception {
- mock.expectedMessageCount(1);
-
- producer.sendBody(null);
-
- mock.assertIsSatisfied();
- }
-}
\ No newline at end of file
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java
deleted file mode 100644
index a004d1e..0000000
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.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.itest.http;
-import java.io.IOException;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.http.Consts;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpRequestHandler;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-
-@ContextConfiguration
-public class Http4MaxConnectionPerHostTest extends
- AbstractJUnit4SpringContextTests {
- protected static HttpTestServer localServer;
-
- @Autowired
- protected CamelContext camelContext;
-
- @EndpointInject("direct:start")
- protected ProducerTemplate producer;
-
- @EndpointInject("mock:result")
- protected MockEndpoint mock;
-
- @BeforeClass
- public static void setUp() throws Exception {
- localServer = new HttpTestServer(null, null);
- localServer.register("/", new HttpRequestHandler() {
- public void handle(HttpRequest request, HttpResponse response,
- HttpContext context) throws HttpException, IOException {
- response.setStatusCode(HttpStatus.SC_OK);
- response.setEntity(new StringEntity("OK", Consts.ISO_8859_1));
- }
- });
- localServer.start();
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- if (localServer != null) {
- localServer.stop();
- }
- }
-
- @Test
- public void testMocksIsValid() throws Exception {
- mock.expectedMessageCount(1);
-
- producer.sendBody(null);
-
- mock.assertIsSatisfied();
- }
-}
\ No newline at end of file
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java
deleted file mode 100644
index 383a78a..0000000
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java
+++ /dev/null
@@ -1,89 +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.itest.http;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.http.common.HttpMessage;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-
-public class Http4RouteTest extends CamelTestSupport {
- private int port1;
- private int port2;
-
- @Test
- public void sendHttpGetRequestTest() {
- String response = template.requestBody("http://localhost:" + port1
- + "/test?aa=bb&httpClient.socketTimeout=10000&httpClient.connectTimeout=10000"
- + "&bridgeEndpoint=true&throwExceptionOnFailure=false", null, String.class);
- assertEquals("Get a wrong response", "aa=bb", response);
-
- response = template.requestBodyAndHeader("direct:start1", null, Exchange.HTTP_QUERY, "aa=bb", String.class);
-
- assertEquals("Get a wrong response", "aa=bb", response);
-
- response = template.requestBodyAndHeader("direct:start2", null, Exchange.HTTP_QUERY, "aa=bb", String.class);
- assertEquals("Get a wrong response", "aa=bb&2", response);
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- port1 = AvailablePortFinder.getNextAvailable(8000);
- port2 = AvailablePortFinder.getNextAvailable(9000);
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
-
- from("jetty:http://localhost:" + port1 + "/test").process(new Processor() {
-
- @Override
- public void process(Exchange exchange) throws Exception {
- HttpMessage message = (HttpMessage)exchange.getIn();
- assertNotNull(message.getRequest());
- assertEquals("GET", message.getRequest().getMethod());
- exchange.getOut().setBody(message.getRequest().getQueryString());
-
- }
-
- });
-
- from("jetty:http://localhost:" + port2 + "/test").process(new Processor() {
-
- @Override
- public void process(Exchange exchange) throws Exception {
- HttpMessage message = (HttpMessage)exchange.getIn();
- assertNotNull(message.getRequest());
- assertEquals("GET", message.getRequest().getMethod());
- exchange.getOut().setBody(message.getRequest().getQueryString() + "&2");
- }
-
- });
-
- from("direct:start1").to("http://localhost:" + port1 + "/test");
-
- from("direct:start2").to("http://localhost:" + port2 + "/test");
-
-
-
- }
- };
- }
-
-}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java
index 461cf0f..c1cf776 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpEndpointTest.java
@@ -15,20 +15,30 @@
* limitations under the License.
*/
package org.apache.camel.itest.http;
+import java.io.IOException;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
+import org.apache.http.Consts;
+import org.apache.http.HttpException;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.HttpRequestHandler;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
-@Ignore("Requires online access to the internet")
public class HttpEndpointTest extends AbstractJUnit4SpringContextTests {
+ protected static HttpTestServer localServer;
@Autowired
protected CamelContext camelContext;
@@ -39,6 +49,28 @@ public class HttpEndpointTest extends AbstractJUnit4SpringContextTests {
@EndpointInject("mock:result")
protected MockEndpoint mock;
+
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ localServer = new HttpTestServer(null, null);
+ localServer.register("/", new HttpRequestHandler() {
+ public void handle(HttpRequest request, HttpResponse response,
+ HttpContext context) throws HttpException, IOException {
+ response.setStatusCode(HttpStatus.SC_OK);
+ response.setEntity(new StringEntity("OK", Consts.ISO_8859_1));
+ }
+ });
+ localServer.start();
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ if (localServer != null) {
+ localServer.stop();
+ }
+ }
+
@Test
public void testMocksIsValid() throws Exception {
mock.expectedMessageCount(1);
@@ -47,5 +79,4 @@ public class HttpEndpointTest extends AbstractJUnit4SpringContextTests {
mock.assertIsSatisfied();
}
-
-}
+}
\ No newline at end of file
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java
index cdfa62a..6eae790 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpMaxConnectionPerHostTest.java
@@ -15,20 +15,31 @@
* limitations under the License.
*/
package org.apache.camel.itest.http;
+import java.io.IOException;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
+import org.apache.http.Consts;
+import org.apache.http.HttpException;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.HttpRequestHandler;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration
-@Ignore("Requires online access to the internet")
-public class HttpMaxConnectionPerHostTest extends AbstractJUnit4SpringContextTests {
+public class HttpMaxConnectionPerHostTest extends
+ AbstractJUnit4SpringContextTests {
+ protected static HttpTestServer localServer;
@Autowired
protected CamelContext camelContext;
@@ -39,6 +50,26 @@ public class HttpMaxConnectionPerHostTest extends AbstractJUnit4SpringContextTes
@EndpointInject("mock:result")
protected MockEndpoint mock;
+ @BeforeClass
+ public static void setUp() throws Exception {
+ localServer = new HttpTestServer(null, null);
+ localServer.register("/", new HttpRequestHandler() {
+ public void handle(HttpRequest request, HttpResponse response,
+ HttpContext context) throws HttpException, IOException {
+ response.setStatusCode(HttpStatus.SC_OK);
+ response.setEntity(new StringEntity("OK", Consts.ISO_8859_1));
+ }
+ });
+ localServer.start();
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ if (localServer != null) {
+ localServer.stop();
+ }
+ }
+
@Test
public void testMocksIsValid() throws Exception {
mock.expectedMessageCount(1);
@@ -47,5 +78,4 @@ public class HttpMaxConnectionPerHostTest extends AbstractJUnit4SpringContextTes
mock.assertIsSatisfied();
}
-
-}
+}
\ No newline at end of file
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
index da376c9..400be93 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
@@ -38,7 +38,7 @@ public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
@Test
public void testHostHeader() throws Exception {
- //The first two calls will test http4 producers
+ //The first two calls will test http producers
//The first call to our service will hit the first destination in the round robin load balancer
//this destination has the preserveProxyHeader parameter set to true, so we verify the Host header
diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml
index 484b8c5..2ddffc8 100644
--- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml
+++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4EndpointTest-context.xml
@@ -28,7 +28,7 @@
<!-- START SNIPPET: e1 -->
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <bean id="httpEndpoint" class="org.apache.camel.component.http4.HttpEndpoint">
+ <bean id="httpEndpoint" class="org.apache.camel.component.http.HttpEndpoint">
<property name="httpUri" value="http://localhost:${HttpTestServer.Port}/"/>
<property name="clientBuilder" ref="clientBuilder"/>
<property name="clientConnectionManager" ref="myManager"/>
diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml
index e7c131f..8b3c66d 100644
--- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml
+++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest-context.xml
@@ -27,7 +27,7 @@
<!-- START SNIPPET: e1 -->
<bean id="properties" class="org.apache.camel.component.properties.PropertiesComponent"/>
- <bean id="httpComponent" class="org.apache.camel.component.http4.HttpComponent">
+ <bean id="httpComponent" class="org.apache.camel.component.http.HttpComponent">
<property name="camelContext" ref="camel"/>
<property name="connectionsPerRoute" value="5" />
</bean>