This is an automated email from the ASF dual-hosted git repository.
janbednar pushed a commit to branch CAMEL-13853
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cda1d1aadbf9ba9cdd1a8856632e42e685a268ca
Merge: 65e2582 ab594f3
Author: Jan Bednář <m...@janbednar.eu>
AuthorDate: Wed Aug 14 00:53:47 2019 +0200
Merge branch 'master' of https://github.com/apache/camel into CAMEL-13853
# Conflicts:
#
tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java
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 => 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 +-
.../camel/component/http4/CamelHttp4Context.xml | 79 --------
.../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 ------
.../config/CamelMicroProfilePropertiesSource.java | 13 +-
.../CamelMicroProfilePropertiesSourceTest.java | 10 ++
...pBindingPreservePostFormUrlEncodedBodyTest.java | 2 +-
.../http/NettyHttpBindingUseAbsolutePathTest.java | 2 +-
.../NettyHttpBindingUseRelativePathInPostTest.java | 2 +-
.../http/NettyHttpBindingUseRelativePathTest.java | 2 +-
.../camel/component/olingo2/Olingo2Consumer.java | 3 +-
.../olingo2/Olingo2ComponentConsumerTest.java | 111 +++++++++++-
.../camel/component/olingo4/Olingo4Consumer.java | 3 +-
.../olingo4/Olingo4ComponentConsumerTest.java | 144 ++++++++++++++-
.../src/main/docs/properties-component.adoc | 3 +-
.../src/main/docs/pulsar-component.adoc | 9 +-
.../pulsar/DefaultPulsarMessageReceipt.java | 67 +++++++
.../DefaultPulsarMessageReceiptFactory.java} | 20 +--
.../camel/component/pulsar/PulsarComponent.java | 33 ++++
.../camel/component/pulsar/PulsarEndpoint.java | 5 +
.../component/pulsar/PulsarMessageListener.java | 11 +-
.../component/pulsar/PulsarMessageReceipt.java | 70 ++++++++
.../pulsar/PulsarMessageReceiptFactory.java} | 28 ++-
.../pulsar/configuration/PulsarConfiguration.java | 43 +++++
.../consumers/CommonCreationStrategyImpl.java | 3 +
.../pulsar/utils/message/PulsarMessageHeaders.java | 1 +
.../component/pulsar/PulsarComponentTest.java | 14 ++
.../pulsar/PulsarConsumerAcknowledgementTest.java | 200 +++++++++++++++++++++
.../PulsarConsumerNoAcknowledgementTest.java | 103 +++++++++++
.../pulsar/PulsarCustomMessageReceiptTest.java | 135 ++++++++++++++
.../pulsar/PulsarNegativeAcknowledgementTest.java} | 23 +--
.../component/restlet/RestRestletRouterIdTest.java | 2 +-
.../PreservePostFormUrlEncodedBodyTest.java | 10 +-
.../src/main/docs/eips/aggregate-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/choice-eip.adoc | 2 +-
.../src/main/docs/eips/claimCheck-eip.adoc | 2 +-
.../main/docs/eips/content-based-router-eip.adoc | 2 +-
.../src/main/docs/eips/content-filter-eip.adoc | 2 +-
.../src/main/docs/eips/dynamic-router.adoc | 2 +-
.../src/main/docs/eips/dynamicRouter-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/enrich-eip.adoc | 2 +-
.../main/docs/eips/eventDrivenConsumer-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/filter-eip.adoc | 2 +-
.../src/main/docs/eips/otherwise-eip.adoc | 2 +-
.../src/main/docs/eips/pipeline-eip.adoc | 2 +-
.../src/main/docs/eips/recipientList-eip.adoc | 2 +-
.../src/main/docs/eips/requestReply-eip.adoc | 2 +-
.../src/main/docs/eips/resequence-eip.adoc | 2 +-
.../src/main/docs/eips/rollback-eip.adoc | 2 +-
.../src/main/docs/eips/routingSlip-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/split-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/step-eip.adoc | 2 +-
core/camel-core/src/main/docs/eips/when-eip.adoc | 2 +-
.../camel-core/src/main/docs/eips/wireTap-eip.adoc | 2 +-
.../apache/camel/language/simple/SimpleTest.java | 2 +-
.../endpoint/dsl/HttpEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/PulsarEndpointBuilderFactory.java | 86 +++++++++
.../modules/ROOT/pages/http-component.adoc | 16 +-
.../modules/ROOT/pages/jetty-component.adoc | 6 +-
.../modules/ROOT/pages/properties-component.adoc | 6 +-
.../modules/ROOT/pages/pulsar-component.adoc | 9 +-
.../modules/ROOT/assets/images/eip/Aggregator.gif | Bin 0 -> 2413 bytes
.../ROOT/assets/images/eip/AggregatorIcon.gif | Bin 0 -> 392 bytes
.../modules/ROOT/assets/images/eip/ChannelIcon.gif | Bin 0 -> 376 bytes
.../assets/images/eip/CompetingConsumersIcon.gif | Bin 0 -> 428 bytes
.../ROOT/assets/images/eip/ContentBasedRouter.gif | Bin 0 -> 2504 bytes
.../assets/images/eip/ContentBasedRouterIcon.gif | Bin 0 -> 356 bytes
.../ROOT/assets/images/eip/ContentFilter.gif | Bin 0 -> 1777 bytes
.../ROOT/assets/images/eip/ContentFilterIcon.gif | Bin 0 -> 375 bytes
.../ROOT/assets/images/eip/ControlBusIcon.gif | Bin 0 -> 764 bytes
.../images/eip/CorrelationIdentifierIcon.gif | Bin 0 -> 375 bytes
.../images/eip/CorrelationIdentifierSolution.gif | Bin 0 -> 4041 bytes
.../ROOT/assets/images/eip/DataEnricher.gif | Bin 0 -> 2703 bytes
.../ROOT/assets/images/eip/DataEnricherIcon.gif | Bin 0 -> 372 bytes
.../assets/images/eip/DeadLetterChannelIcon.gif | Bin 0 -> 519 bytes
.../images/eip/DeadLetterChannelSolution.gif | Bin 0 -> 3557 bytes
.../modules/ROOT/assets/images/eip/DetourIcon.gif | Bin 0 -> 678 bytes
.../images/eip/DistributionAggregateIcon.gif | Bin 0 -> 491 bytes
.../assets/images/eip/DurableSubscriptionIcon.gif | Bin 0 -> 306 bytes
.../ROOT/assets/images/eip/DynamicRouter.gif | Bin 0 -> 7122 bytes
.../ROOT/assets/images/eip/DynamicRouterIcon.gif | Bin 0 -> 654 bytes
.../assets/images/eip/EventDrivenConsumerIcon.gif | Bin 0 -> 388 bytes
.../images/eip/EventDrivenConsumerSolution.gif | Bin 0 -> 2077 bytes
.../ROOT/assets/images/eip/EventMessageIcon.gif | Bin 0 -> 264 bytes
.../assets/images/eip/EventMessageSolution.gif | Bin 0 -> 2843 bytes
.../assets/images/eip/GuaranteedMessagingIcon.gif | Bin 0 -> 312 bytes
.../images/eip/GuaranteedMessagingSolution.gif | Bin 0 -> 4574 bytes
.../ROOT/assets/images/eip/MessageBusIcon.gif | Bin 0 -> 381 bytes
.../ROOT/assets/images/eip/MessageBusSolution.gif | Bin 0 -> 2243 bytes
.../assets/images/eip/MessageChannelSolution.gif | Bin 0 -> 3343 bytes
.../assets/images/eip/MessageDispatcherIcon.gif | Bin 0 -> 431 bytes
.../ROOT/assets/images/eip/MessageEndpointIcon.gif | Bin 0 -> 391 bytes
.../assets/images/eip/MessageEndpointSolution.gif | Bin 0 -> 3816 bytes
.../ROOT/assets/images/eip/MessageFilter.gif | Bin 0 -> 3820 bytes
.../ROOT/assets/images/eip/MessageFilterIcon.gif | Bin 0 -> 497 bytes
.../modules/ROOT/assets/images/eip/MessageIcon.gif | Bin 0 -> 799 bytes
.../ROOT/assets/images/eip/MessageRouter.gif | Bin 0 -> 3340 bytes
.../ROOT/assets/images/eip/MessageSelectorIcon.gif | Bin 0 -> 455 bytes
.../ROOT/assets/images/eip/MessageSolution.gif | Bin 0 -> 1256 bytes
.../ROOT/assets/images/eip/MessageTranslator.gif | Bin 0 -> 2183 bytes
.../assets/images/eip/MessageTranslatorIcon.gif | Bin 0 -> 487 bytes
.../assets/images/eip/MessagingAdapterIcon.gif | Bin 0 -> 388 bytes
.../assets/images/eip/MessagingGatewayIcon.gif | Bin 0 -> 485 bytes
.../ROOT/assets/images/eip/NormalizerIcon.gif | Bin 0 -> 401 bytes
.../ROOT/assets/images/eip/PipesAndFilters.gif | Bin 0 -> 2906 bytes
.../ROOT/assets/images/eip/PipesAndFiltersIcon.gif | Bin 0 -> 455 bytes
.../ROOT/assets/images/eip/PointToPointIcon.gif | Bin 0 -> 147 bytes
.../assets/images/eip/PointToPointSolution.gif | Bin 0 -> 2995 bytes
.../ROOT/assets/images/eip/PollingConsumerIcon.gif | Bin 0 -> 418 bytes
.../assets/images/eip/PollingConsumerSolution.gif | Bin 0 -> 2117 bytes
.../assets/images/eip/PublishSubscribeIcon.gif | Bin 0 -> 227 bytes
.../assets/images/eip/PublishSubscribeSolution.gif | Bin 0 -> 4269 bytes
.../ROOT/assets/images/eip/RecipientList.gif | Bin 0 -> 5065 bytes
.../ROOT/assets/images/eip/RecipientListIcon.gif | Bin 0 -> 368 bytes
.../ROOT/assets/images/eip/RequestReply.gif | Bin 0 -> 3141 bytes
.../ROOT/assets/images/eip/RequestReplyIcon.gif | Bin 0 -> 274 bytes
.../modules/ROOT/assets/images/eip/Resequencer.gif | Bin 0 -> 1965 bytes
.../ROOT/assets/images/eip/ResequencerIcon.gif | Bin 0 -> 435 bytes
.../ROOT/assets/images/eip/ReturnAddressIcon.gif | Bin 0 -> 302 bytes
.../assets/images/eip/ReturnAddressSolution.gif | Bin 0 -> 5867 bytes
.../ROOT/assets/images/eip/RoutingTableIcon.gif | Bin 0 -> 376 bytes
.../ROOT/assets/images/eip/RoutingTableSimple.gif | Bin 0 -> 3459 bytes
.../modules/ROOT/assets/images/eip/Sequencer.gif | Bin 0 -> 2298 bytes
.../ROOT/assets/images/eip/SplitterIcon.gif | Bin 0 -> 397 bytes
.../ROOT/assets/images/eip/StoreInLibrary.gif | Bin 0 -> 6440 bytes
.../ROOT/assets/images/eip/StoreInLibraryIcon.gif | Bin 0 -> 684 bytes
.../assets/images/eip/TransactionalClientIcon.gif | Bin 0 -> 486 bytes
.../images/eip/TransactionalClientSolution.gif | Bin 0 -> 3654 bytes
.../modules/ROOT/assets/images/eip/WireTap.gif | Bin 0 -> 3067 bytes
.../modules/ROOT/assets/images/eip/WireTapIcon.gif | Bin 0 -> 481 bytes
.../modules/ROOT/pages/aggregate-eip.adoc | 2 +-
.../user-manual/modules/ROOT/pages/choice-eip.adoc | 2 +-
.../modules/ROOT/pages/claimCheck-eip.adoc | 2 +-
.../ROOT/pages/content-based-router-eip.adoc | 2 +-
.../modules/ROOT/pages/content-enricher.adoc | 2 +-
.../modules/ROOT/pages/content-filter-eip.adoc | 2 +-
.../modules/ROOT/pages/correlation-identifier.adoc | 2 +-
.../modules/ROOT/pages/dead-letter-channel.adoc | 2 +-
.../modules/ROOT/pages/dynamic-router.adoc | 2 +-
.../modules/ROOT/pages/dynamicRouter-eip.adoc | 2 +-
.../user-manual/modules/ROOT/pages/enrich-eip.adoc | 2 +-
.../pages/enterprise-integration-patterns.adoc | 112 ++++++------
.../modules/ROOT/pages/event-message.adoc | 2 +-
.../ROOT/pages/eventDrivenConsumer-eip.adoc | 2 +-
.../user-manual/modules/ROOT/pages/filter-eip.adoc | 2 +-
.../modules/ROOT/pages/guaranteed-delivery.adoc | 2 +-
.../modules/ROOT/pages/http-session-handling.adoc | 2 +-
.../modules/ROOT/pages/http-session.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/karaf.adoc | 1 -
.../modules/ROOT/pages/message-bus.adoc | 2 +-
.../modules/ROOT/pages/message-channel.adoc | 2 +-
.../modules/ROOT/pages/message-endpoint.adoc | 2 +-
.../modules/ROOT/pages/message-router.adoc | 2 +-
.../modules/ROOT/pages/message-translator.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/message.adoc | 2 +-
.../modules/ROOT/pages/otherwise-eip.adoc | 2 +-
.../modules/ROOT/pages/pipeline-eip.adoc | 2 +-
.../modules/ROOT/pages/point-to-point-channel.adoc | 2 +-
.../modules/ROOT/pages/polling-consumer.adoc | 2 +-
.../ROOT/pages/publish-subscribe-channel.adoc | 2 +-
.../modules/ROOT/pages/recipientList-eip.adoc | 2 +-
.../modules/ROOT/pages/requestReply-eip.adoc | 2 +-
.../modules/ROOT/pages/resequence-eip.adoc | 2 +-
.../modules/ROOT/pages/return-address.adoc | 2 +-
.../modules/ROOT/pages/rollback-eip.adoc | 2 +-
.../modules/ROOT/pages/routingSlip-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/split-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/step-eip.adoc | 2 +-
.../modules/ROOT/pages/transactional-client.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/when-eip.adoc | 2 +-
.../modules/ROOT/pages/wireTap-eip.adoc | 2 +-
parent/pom.xml | 2 +-
.../springboot/HttpComponentAutoConfiguration.java | 4 +-
.../springboot/HttpComponentConfiguration.java | 4 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../springboot/PulsarComponentConfiguration.java | 32 ++++
.../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 | 55 ------
.../http/Http4MaxConnectionPerHostTest-context.xml | 46 -----
.../camel/itest/http/HttpEndpointTest-context.xml | 21 ++-
.../http/HttpMaxConnectionPerHostTest-context.xml | 18 +-
290 files changed, 1767 insertions(+), 1273 deletions(-)
