You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/08/08 18:37:39 UTC
[camel] branch CAMEL-13826 updated (3cde606 -> 9fbfea4)
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a change to branch CAMEL-13826
in repository https://gitbox.apache.org/repos/asf/camel.git.
omit 3cde606 CAMEL-13826: Added camel-test-junit5 in camel pom, common-bin, camel-bom and fixed mvn install
omit 97531ca CAMEL-13826: Raised the junit-jupiter-version in the parent pom and fixed check style issues
omit 8e54095 CAMEL-13826: Initial version of a camel-test module with JUnit 5
add 0931438 Polished and fixed typo
add d6b7bdd Fixed CS for Camel-CDI
add bfd14cf Fixed CS for Camel-Kafka
add 898c39a CAMEL-12864: camel-rest-swagger producer should remove Host header if its already on the Camel Message as it should use the configured Host on the rest component instead.
add 17bdacd Upgrade Box to version 2.36.0
add 976ed37 CAMEL-13083: Upgrade to newer guava version.
add a94f67d CAMEL-13267: Enable automatic recovery on camel-rabbitmq in case connection fails for some reason.
add 23d6610 Polished
add 7d1cc9e Regen
add 4a2cfbd CAMEL-13561: camel-hystrix - HystrixBadRequestException is swallowed
add c0bf3d4 CAMEL-13287: AggregationStrategy - Access original exchange in aggregate method for multicast, recipient list and splitter
add 010cbdd CAMEL-10910: A route with a single output should also use a pipeline so its the same behaviour as if the route has 2+ outputs.
add 21c230f CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz
add e9f2a06 CAMEL-13792 - Rename components to default names, Camel-quartz2 to camel-quartz
add ce46960 Fixed CS for Camel-Saxon
add 1633722 CAMEL-13712: camel-mail should use hostname and port from custom MailSession if its been configured.
add cc91ccd Fixed CS
add b2d3b54 CAMEL-13738: parent/pom.xml - use dash in version properties
add 7f1b0b6 CAMEL-13740: Update xstream json docs
add 6153504 Regen
add fc5a271 Upgrade jetty
add c30da59 CAMEL-13796: Allow to configure idle and connection timeout on camel-salesforce http client and increaase default a bit
add 156fa41 CAMEL-13829: Add caution to transferExchange/transferException option on JMS components
add 3417c9e CAMEL-13774: camel-zipfile now supports marshal an iterator to zipfile
add b8cd499 CAMEL-13774: camel-zipfile now supports marshal an iterator to zipfile. And made it more general with a type converter so we can also write directly to a file via the file component.
add 60f1d55 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty
add b3d8e32 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - updated docs
add 2e6a710 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - updated references
add 06e4248 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - updated references to netty4-http
add 90354bb CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - DocumentationHelper class needs to point to new netty.json
add 7028caa CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Updated docs
add 24b727c CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed Camel-ganglia test
add db32370 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed refs in camel-mllp
add 99df195 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Removed refs in netty4-http component
add f9680c6 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned REST DSL stuff to point to netty4-http only
add dc410a7 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed syslog tests
add aa9a4dc CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned camel-netty-correlation example
add ef7e19a CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Karaf integration tests and features updated
add 3020344 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - SB integration test updated
add 29bd41b CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed hl7 tests
add 1705731 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned camel-netty tests
add c4fe00d CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned camel-netty4-http tests
add cffec58 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Removed last refs
add 3d2701d CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Added note on MIGRATION guide
add 8477380 Super Regen!
add ca3d9ab Upgrade Wiremock to version 2.24.1
add fa92d6f Upgrade AssertJ to version 3.13.2
add 2d4b651 Fixed CS for Camel-support
add 06c166c Fixed CS for Camel-test-blueprint
add 127108d Fixed wrong default in docs
add 6d097c0 Upgrade Johnzon to version 1.1.13
add 725db4f CAMEL-13834: camel-util does not provide a sfl4j binding for testing
add 6dde4af CAMEL-13826: Added a module that allows to write camel test with JUnit 5
add 81798b0 CAMEL-13832: Properties component - Check ENV before JVM System property
add e02c35e CAMEL-13833: Properties component - Fallback to ENV should replace dots with underscores (#3085)
add a6a6fea CAMEL-13835: camel-util : cleanup pom (#3087)
add 2cb32bc Fixed compile error
add 6a1f1fb Regen
add 7c8ce0d Fixed CS
add 2e64f40 CAMEL-13836: camel-util: move SedaConstants to camel-seda (#3088)
add ea03c80 Polished
add b8b9386 Add camel-jaxp to release kit
add 469fd58 Upgrade Univocity Parsers to version 2.8.3
add 1fe1193 Upgrade Narayana to version 5.9.6.Final
add 061188b Updating Commons Codec
add 9dbd15e CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http
add ad2fbd2 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - update references
add 43b331f CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - update docs
add 72130d1 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed more references
add 240d59c CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed more references
add 9d84607 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed docs and regen
add 6aa6939 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed more refs, docs and regen
add da71f3f CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Karaf integration test and feature updated
add 0db4b35 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - SB integration test updated
add d9e73ab CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed docs and camel-catalog tests
add b9ddc49 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Regen take 2
add 9c715f7 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed refs and camel-route-parser tests
add feb4e97 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed refs in camel-rest
add a617215 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed refs in camel-swagger-java
add b2e16f3 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed refs and test for telegram and webhook components
add 0dea407 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed refs and test in Artemis blueprint AMQP Example
add c3fa05b CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed camel-micrometer-example
add 432ce94 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed camel-package-maven-plugin
add aef4b33 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed camel-restdsl-swagger-plugin refs
add 470ab5c CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed last refs
add 0da4518 CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Regen
new 9fbfea4 CAMEL-13826: Turned TestSupport into a utility class
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3cde606)
\
N -- N -- N refs/heads/CAMEL-13826 (9fbfea4)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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 | 2 +
README.md | 1 -
apache-camel/pom.xml | 12 +-
apache-camel/src/main/descriptors/common-bin.xml | 9 +-
apache-camel/src/main/release/README.txt | 1 -
.../src/main/resources/application.properties | 2 +-
bom/camel-bom/pom.xml | 8 +-
.../org/apache/camel/catalog/CamelCatalogTest.java | 54 +--
.../camel/parser/java/MyCdiConcatRouteBuilder.java | 2 +-
.../camel/parser/java/MyCdiRouteBuilder.java | 2 +-
.../RoasterCdiConcatRouteBuilderConfigureTest.java | 2 +-
.../java/RoasterCdiRouteBuilderConfigureTest.java | 2 +-
.../parser/java/RoasterEndpointInjectTest.java | 4 +-
.../src/main/docs/activemq-component.adoc | 8 +-
components/camel-ahc/pom.xml | 2 +-
.../camel-amqp/src/main/docs/amqp-component.adoc | 8 +-
components/camel-atmosphere-websocket/pom.xml | 2 +-
components/camel-bean-validator/pom.xml | 4 +-
.../camel/cdi/xml/CamelContextFactoryBean.java | 49 ++-
components/camel-cm-sms/pom.xml | 4 +-
components/camel-cxf/pom.xml | 2 +-
components/camel-dozer/pom.xml | 4 +-
.../camel-file/src/main/docs/file-component.adoc | 3 +-
.../camel/component/file/GenericFileEndpoint.java | 2 +-
components/camel-ganglia/pom.xml | 2 +-
.../ganglia/GangliaProtocolV30CamelTest.java | 4 +-
.../ganglia/GangliaProtocolV31CamelTest.java | 4 +-
.../component/git/consumer/GitConsumerTest.java | 10 +-
components/camel-google-sheets/pom.xml | 6 +-
components/camel-hl7/pom.xml | 4 +-
.../camel-hl7/src/main/docs/hl7-dataformat.adoc | 10 +-
.../hl7/HL7MLLPNettyCodecBoundaryTest.java | 4 +-
.../hl7/HL7MLLPNettyCodecByteArrayRouteTest.java | 10 +-
.../component/hl7/HL7MLLPNettyCodecLongTest.java | 4 +-
.../hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java | 4 +-
.../camel/component/hl7/HL7MLLPNettyCodecTest.java | 4 +-
.../hl7/HL7MLLPNettyDecoderResourceLeakTest.java | 4 +-
.../component/hl7/HL7MLLPNettyRouteToTest.java | 4 +-
.../camel/component/hl7/HL7NettyRouteTest.java | 8 +-
components/camel-http-common/pom.xml | 2 +-
.../camel/http/common/HttpSendDynamicAware.java | 4 +-
components/camel-http/pom.xml | 2 +-
.../hystrix/processor/HystrixProcessorCommand.java | 8 +-
.../processor/HystrixBadRequestExceptionTest.java | 11 +-
components/camel-jetty-common/pom.xml | 2 +-
.../camel-jms/src/main/docs/jms-component.adoc | 12 +-
.../apache/camel/component/jms/JmsComponent.java | 11 +-
.../camel/component/jms/JmsConfiguration.java | 12 +-
.../camel/component/kafka/embedded/SystemTime.java | 8 +-
.../camel-mail/src/main/docs/mail-component.adoc | 4 +-
.../camel/component/mail/MailConfiguration.java | 10 +-
.../camel-mina/src/main/docs/mina-component.adoc | 4 +-
components/camel-mllp/README.md | 12 +-
.../pom.xml | 10 +-
.../src/main/docs/netty-http-component.adoc | 126 +++---
.../component/netty4/http/ChunkedHttpRequest.java | 0
.../component/netty4/http/ChunkedHttpResponse.java | 0
.../component/netty4/http/ContextPathMatcher.java | 0
.../netty4/http/CustomChunkedWriteHandler.java | 0
.../netty4/http/DefaultContextPathMatcher.java | 0
.../netty4/http/DefaultNettyHttpBinding.java | 0
.../netty4/http/DefaultNettySharedHttpServer.java | 0
.../netty4/http/HttpClientInitializerFactory.java | 0
.../camel/component/netty4/http/HttpPrincipal.java | 0
.../netty4/http/HttpServerBootstrapFactory.java | 0
.../http/HttpServerConsumerChannelFactory.java | 0
.../netty4/http/HttpServerInitializerFactory.java | 0
.../http/HttpServerSharedInitializerFactory.java | 0
.../netty4/http/JAASSecurityAuthenticator.java | 0
.../netty4/http/NettyChannelBufferStreamCache.java | 0
.../NettyChannelBufferStreamCacheOnCompletion.java | 0
.../component/netty4/http/NettyHttpBinding.java | 0
.../component/netty4/http/NettyHttpComponent.java | 20 +-
.../netty4/http/NettyHttpConfiguration.java | 0
.../component/netty4/http/NettyHttpConstants.java | 0
.../component/netty4/http/NettyHttpConsumer.java | 0
.../component/netty4/http/NettyHttpConverter.java | 0
.../component/netty4/http/NettyHttpEndpoint.java | 4 +-
.../netty4/http/NettyHttpHeaderFilterStrategy.java | 0
.../component/netty4/http/NettyHttpHelper.java | 0
.../component/netty4/http/NettyHttpMessage.java | 0
.../http/NettyHttpOperationFailedException.java | 0
.../component/netty4/http/NettyHttpProducer.java | 0
.../http/NettyHttpRestHeaderFilterStrategy.java | 0
.../http/NettyHttpSecurityConfiguration.java | 0
.../netty4/http/NettyHttpSendDynamicAware.java | 4 +-
.../netty4/http/NettySharedHttpServer.java | 0
...ettySharedHttpServerBootstrapConfiguration.java | 0
.../netty4/http/RestContextPathMatcher.java | 0
.../netty4/http/RestNettyHttpBinding.java | 0
.../netty4/http/SecurityAuthenticator.java | 0
.../netty4/http/SecurityAuthenticatorSupport.java | 0
.../component/netty4/http/SecurityConstraint.java | 0
.../netty4/http/SecurityConstraintMapping.java | 0
.../http/cloud/Netty4HttpServiceExpression.java | 2 +-
.../cloud/Netty4HttpServiceExpressionFactory.java | 2 +-
.../http/handlers/HttpClientChannelHandler.java | 0
.../netty4/http/handlers/HttpRestConsumerPath.java | 0
.../http/handlers/HttpServerChannelHandler.java | 0
.../HttpServerMultiplexChannelHandler.java | 0
.../camel/component/netty4/http/BaseNettyTest.java | 0
.../component/netty4/http/LogCaptureAppender.java | 0
.../component/netty4/http/LogCaptureTest.java | 0
.../netty4/http/ManagedNettyEndpointTest.java | 4 +-
.../camel/component/netty4/http/MyLoginModule.java | 0
.../component/netty4/http/MyRolePrincipal.java | 0
.../netty4/http/NettyCamelWebsiteTest.java | 2 +-
.../netty4/http/NettyDefaultProtocolTest.java | 4 +-
.../netty4/http/NettyHttp500ErrorTest.java | 8 +-
...ettyHttp500ErrorThrowExceptionOnServerTest.java | 6 +-
...tyHttpAccessHttpRequestAndResponseBeanTest.java | 6 +-
.../http/NettyHttpAccessHttpRequestBeanTest.java | 4 +-
.../http/NettyHttpAccessHttpRequestTest.java | 4 +-
.../NettyHttpBasicAuthConstraintMapperTest.java | 8 +-
...tpBasicAuthCustomSecurityAuthenticatorTest.java | 6 +-
.../netty4/http/NettyHttpBasicAuthTest.java | 8 +-
...pBindingPreservePostFormUrlEncodedBodyTest.java | 4 +-
.../http/NettyHttpBindingUseAbsolutePathTest.java | 10 +-
.../NettyHttpBindingUseRelativePathInPostTest.java | 4 +-
.../http/NettyHttpBindingUseRelativePathTest.java | 10 +-
.../http/NettyHttpBridgeEncodedPathTest.java | 12 +-
.../NettyHttpBridgeRouteUsingHttpClientTest.java | 6 +-
.../http/NettyHttpCharacterEncodingTest.java | 4 +-
.../netty4/http/NettyHttpClientChunkedTest.java | 4 +-
.../http/NettyHttpClientExpectContinueTest.java | 4 +-
.../netty4/http/NettyHttpCompressTest.java | 4 +-
.../netty4/http/NettyHttpContentTypeTest.java | 8 +-
.../NettyHttpConvertPayloadToInputStreamTest.java | 4 +-
.../netty4/http/NettyHttpCustomOptionsTest.java | 4 +-
.../http/NettyHttpEmptyQueryParameterTest.java | 6 +-
...pEndpointUriCustomHeaderFilterStrategyTest.java | 4 +-
.../NettyHttpEndpointUriEncodingIssueTest.java | 6 +-
...pointUriEncodingIssueUrlDecodeDisabledTest.java | 4 +-
.../http/NettyHttpFilterCamelHeadersTest.java | 4 +-
.../http/NettyHttpGetWithInvalidMessageTest.java | 4 +-
.../NettyHttpGetWithParamAsExchangeHeaderTest.java | 2 +-
.../netty4/http/NettyHttpGetWithParamTest.java | 2 +-
.../netty4/http/NettyHttpHandle404Test.java | 4 +-
.../netty4/http/NettyHttpHeaderCaseTest.java | 2 +-
.../NettyHttpHeaderFilterStrategyRemovalTest.java | 6 +-
.../http/NettyHttpHeaderFilterStrategyTest.java | 0
.../netty4/http/NettyHttpHeaderMaxSizeTest.java | 2 +-
.../netty4/http/NettyHttpHeadersTest.java | 4 +-
.../netty4/http/NettyHttpMapHeadersFalseTest.java | 2 +-
.../netty4/http/NettyHttpMethodRestrictTest.java | 2 +-
.../netty4/http/NettyHttpOkStatusCodeTest.java | 10 +-
.../http/NettyHttpOnExceptionHandledTest.java | 4 +-
.../NettyHttpOperationFailedExceptionTest.java | 0
.../netty4/http/NettyHttpProducerBridgeTest.java | 14 +-
.../http/NettyHttpProducerConcurrentTest.java | 4 +-
.../netty4/http/NettyHttpProducerHeadersTest.java | 0
.../http/NettyHttpProducerKeepAliveTest.java | 14 +-
.../http/NettyHttpProducerQueryParamTest.java | 2 +-
.../http/NettyHttpProducerSendEmptyHeaderTest.java | 4 +-
.../netty4/http/NettyHttpProducerSessionTest.java | 10 +-
.../http/NettyHttpProducerSimpleGetTest.java | 10 +-
.../netty4/http/NettyHttpProducerSimpleTest.java | 6 +-
...ttyHttpProducerThrowExceptionOnFailureTest.java | 6 +-
...tyHttpProducerTwoParametersWithSameKeyTest.java | 6 +-
.../http/NettyHttpProducerWithHeaderTest.java | 6 +-
.../netty4/http/NettyHttpProtocolNoSlashTest.java | 4 +-
.../netty4/http/NettyHttpRawQueryTest.java | 2 +-
.../netty4/http/NettyHttpRedeliveryTest.java | 4 +-
.../http/NettyHttpRedirectNoLocationTest.java | 4 +-
.../netty4/http/NettyHttpRedirectTest.java | 4 +-
.../netty4/http/NettyHttpRequestTimeoutTest.java | 4 +-
.../http/NettyHttpRestContextPathMatcherTest.java | 20 +-
.../netty4/http/NettyHttpRestOptionsAllowTest.java | 4 +-
...ttpReturnDataNotInputStreamConvertableTest.java | 4 +-
.../http/NettyHttpSSLHandshakeErrorTest.java | 4 +-
.../component/netty4/http/NettyHttpSSLTest.java | 2 +-
.../NettyHttpSameHostDifferentParametersTest.java | 6 +-
.../netty4/http/NettyHttpSendDynamicAwareTest.java | 10 +-
...ttyHttpSimpleBasicAuthConstraintMapperTest.java | 8 +-
.../netty4/http/NettyHttpSimpleBasicAuthTest.java | 8 +-
.../component/netty4/http/NettyHttpSimpleTest.java | 4 +-
.../http/NettyHttpSimpleUriParametersTest.java | 4 +-
.../http/NettyHttpStreamCacheFileResponseTest.java | 2 +-
.../netty4/http/NettyHttpSuspendResume503Test.java | 2 +-
.../netty4/http/NettyHttpSuspendResumeTest.java | 2 +-
.../netty4/http/NettyHttpTraceDisabledTest.java | 4 +-
.../http/NettyHttpTransferExceptionTest.java | 4 +-
...ttyHttpTwoRoutesBootstrapConfigurationTest.java | 10 +-
.../NettyHttpTwoRoutesMatchOnUriPrefixTest.java | 14 +-
.../http/NettyHttpTwoRoutesStopOneRouteTest.java | 12 +-
.../netty4/http/NettyHttpTwoRoutesTest.java | 8 +-
...woRoutesValidateBootstrapConfigurationTest.java | 4 +-
.../netty4/http/NettyHttpXMLXPathResponseTest.java | 8 +-
.../netty4/http/NettyHttpXMLXPathTest.java | 8 +-
.../component/netty4/http/NettyMDCLoggingTest.java | 4 +-
.../netty4/http/NettyMixedCaseHttpPathTest.java | 4 +-
.../netty4/http/NettyProxyMixedCasePathTest.java | 8 +-
.../http/NettyRecipientListHttpBaseTest.java | 4 +-
.../netty4/http/NettyRequestManagementTest.java | 4 +-
.../http/NettyRouteSimpleDynamicURITest.java | 8 +-
.../netty4/http/NettyRouteSimpleTest.java | 8 +-
.../netty4/http/NettySharedHttpServerTest.java | 8 +-
.../netty4/http/NettyUseRawHttpResponseTest.java | 4 +-
.../component/netty4/http/ProxyProtocolTest.java | 0
.../netty4/http/SecurityConstraintMappingTest.java | 0
.../netty4/http/SpringNettyHttpBasicAuthTest.java | 14 +-
.../netty4/http/SpringNettyHttpSSLTest.java | 0
.../http/cloud/Netty4HttpServiceCallRouteTest.java | 6 +-
.../component/netty4/http/rest/CountryPojo.java | 0
.../netty4/http/rest/RestApiNettyTest.java | 4 +-
.../RestNettyHttpBindingModeAutoWithJsonTest.java | 4 +-
.../RestNettyHttpBindingModeAutoWithXmlTest.java | 4 +-
.../rest/RestNettyHttpBindingModeJsonTest.java | 6 +-
...stNettyHttpBindingModeJsonWithContractTest.java | 4 +-
...estNettyHttpBindingModeOffWithContractTest.java | 4 +-
.../http/rest/RestNettyHttpBindingModeXmlTest.java | 6 +-
.../RestNettyHttpContextPathConfigurationTest.java | 8 +-
.../rest/RestNettyHttpContextPathMatchGetTest.java | 8 +-
.../netty4/http/rest/RestNettyHttpGetCorsTest.java | 4 +-
.../netty4/http/rest/RestNettyHttpGetTest.java | 6 +-
.../http/rest/RestNettyHttpGetWildcardsTest.java | 8 +-
.../netty4/http/rest/RestNettyHttpOptionsTest.java | 2 +-
.../http/rest/RestNettyHttpPojoInOutTest.java | 8 +-
.../rest/RestNettyHttpPostJsonJaxbPojoTest.java | 6 +-
.../rest/RestNettyHttpPostJsonPojoListTest.java | 6 +-
.../http/rest/RestNettyHttpPostJsonPojoTest.java | 6 +-
.../rest/RestNettyHttpPostXmlJaxbPojoTest.java | 8 +-
.../netty4/http/rest/RestNettyHttpVerbTest.java | 2 +-
.../http/rest/RestNettyMethodNotAllowedTest.java | 2 +-
.../netty4/http/rest/RestNettyProducerGetTest.java | 2 +-
.../rest/RestNettyProducerGetUriParameterTest.java | 2 +-
.../netty4/http/rest/RestNettyProducerPutTest.java | 2 +-
.../RestNettyProducerThrowExceptionErrorTest.java | 2 +-
.../rest/RestNettyProducerVerbUpperCaseTest.java | 2 +-
.../netty4/http/rest/RestPathMatchingTest.java | 0
.../component/netty4/http/rest/UserJaxbPojo.java | 0
.../camel/component/netty4/http/rest/UserPojo.java | 0
.../component/netty4/http/rest/UserPojoEx.java | 0
.../component/netty4/http/rest/UserService.java | 0
.../src/test/resources/jsse/client-keystore.jks | Bin
.../src/test/resources/jsse/client-truststore.jks | Bin
.../src/test/resources/jsse/localhost.ks | Bin
.../src/test/resources/jsse/server-keystore.jks | Bin
.../src/test/resources/jsse/server-truststore.jks | Bin
.../src/test/resources/log4j2.properties | 2 +-
.../src/test/resources/myjaas.config | 0
.../netty4/http/SpringNettyHttpBasicAuthTest.xml | 2 +-
.../netty4/http/SpringNettyHttpSSLTest.xml | 2 +-
components/{camel-netty4 => camel-netty}/pom.xml | 4 +-
.../camel-netty/src/main/docs/netty-component.adoc | 220 +++++-----
.../component/netty4/ChannelHandlerFactories.java | 0
.../component/netty4/ChannelHandlerFactory.java | 0
.../component/netty4/ClientInitializerFactory.java | 0
.../ClientModeTCPNettyServerBootstrapFactory.java | 0
.../netty4/DefaultChannelHandlerFactory.java | 0
.../netty4/DefaultClientInitializerFactory.java | 0
.../DefaultNettyCamelStateCorrelationManager.java | 0
.../netty4/DefaultServerInitializerFactory.java | 0
.../camel/component/netty4/NettyCamelState.java | 0
.../netty4/NettyCamelStateCorrelationManager.java | 0
.../camel/component/netty4/NettyComponent.java | 2 +-
.../camel/component/netty4/NettyConfiguration.java | 0
.../camel/component/netty4/NettyConstants.java | 0
.../camel/component/netty4/NettyConsumer.java | 0
.../netty4/NettyConsumerExceptionHandler.java | 0
.../camel/component/netty4/NettyConverter.java | 0
.../camel/component/netty4/NettyEndpoint.java | 4 +-
.../apache/camel/component/netty4/NettyHelper.java | 0
.../camel/component/netty4/NettyPayloadHelper.java | 0
.../camel/component/netty4/NettyProducer.java | 0
.../netty4/NettyServerBootstrapConfiguration.java | 0
.../netty4/NettyServerBootstrapFactory.java | 0
.../netty4/NettyServerBossPoolBuilder.java | 0
.../component/netty4/NettyWorkerPoolBuilder.java | 0
.../component/netty4/ServerInitializerFactory.java | 0
.../netty4/ShareableChannelHandlerFactory.java | 0
.../netty4/SharedSingletonObjectPool.java | 0
.../SingleTCPNettyServerBootstrapFactory.java | 0
.../SingleUDPNettyServerBootstrapFactory.java | 0
.../camel/component/netty4/TextLineDelimiter.java | 0
.../netty4/TimeoutCorrelationManagerSupport.java | 0
.../codec/DatagramPacketByteArrayDecoder.java | 0
.../codec/DatagramPacketByteArrayEncoder.java | 0
.../netty4/codec/DatagramPacketDecoder.java | 0
.../codec/DatagramPacketDelimiterDecoder.java | 0
.../netty4/codec/DatagramPacketEncoder.java | 0
.../netty4/codec/DatagramPacketObjectDecoder.java | 0
.../netty4/codec/DatagramPacketObjectEncoder.java | 0
.../netty4/codec/DatagramPacketStringDecoder.java | 0
.../netty4/codec/DatagramPacketStringEncoder.java | 0
.../netty4/codec/DelegateByteArrayDecoder.java | 0
.../netty4/codec/DelegateByteArrayEncoder.java | 0
.../netty4/codec/DelimiterBasedFrameDecoder.java | 0
.../netty4/codec/LineBasedFrameDecoder.java | 0
.../component/netty4/codec/ObjectDecoder.java | 0
.../component/netty4/codec/ObjectEncoder.java | 0
.../netty4/handlers/ClientChannelHandler.java | 0
.../netty4/handlers/ServerChannelHandler.java | 0
.../handlers/ServerResponseFutureListener.java | 0
.../component/netty4/ssl/SSLEngineFactory.java | 0
.../camel/component/netty4/util/SubnetUtils.java | 0
.../src/test/data/message1.txt | 0
.../camel/component/netty4/BaseNettyTest.java | 0
.../netty4/DatagramPacketByteArrayCodecTest.java | 0
.../camel/component/netty4/LogCaptureAppender.java | 0
.../camel/component/netty4/LogCaptureTest.java | 0
.../component/netty4/MultipleCodecsSpringTest.java | 0
.../camel/component/netty4/MultipleCodecsTest.java | 4 +-
.../camel/component/netty4/MyCustomCodec.java | 0
.../camel/component/netty4/Netty2978IssueTest.java | 4 +-
.../camel/component/netty4/NettyBacklogTest.java | 2 +-
.../NettyComponentWithConfigurationTest.java | 12 +-
.../component/netty4/NettyConcurrentTest.java | 4 +-
.../NettyConsumerClientModeReconnectTest.java | 2 +-
.../NettyConsumerClientModeReuseChannelTest.java | 2 +-
.../netty4/NettyConsumerClientModeTest.java | 2 +-
.../camel/component/netty4/NettyConverterTest.java | 0
.../component/netty4/NettyCustomCodecTest.java | 2 +-
.../netty4/NettyCustomCorrelationManagerTest.java | 4 +-
.../NettyCustomPipelineFactoryAsynchTest.java | 4 +-
.../NettyCustomPipelineFactorySynchTest.java | 4 +-
.../component/netty4/NettyDisconnectTest.java | 4 +-
.../camel/component/netty4/NettyFileTcpTest.java | 4 +-
.../NettyGlobalSSLContextParametersTest.java | 6 +-
.../NettyInOutCloseChannelWhenCompleteTest.java | 4 +-
.../component/netty4/NettyInOutFromSedaTest.java | 4 +-
.../netty4/NettyInOutWithForcedNoResponseTest.java | 6 +-
.../component/netty4/NettyManualEndpointTest.java | 4 +-
.../NettyMultipleSimultaneousClientsTest.java | 2 +-
.../camel/component/netty4/NettyOptionTest.java | 2 +-
.../netty4/NettyProducerAsyncEndpointTest.java | 4 +-
.../component/netty4/NettyProducerHangTest.java | 8 +-
.../netty4/NettyProducerPoolDisabledTest.java | 4 +-
.../camel/component/netty4/NettyProxyTest.java | 8 +-
.../component/netty4/NettyRedeliveryTest.java | 2 +-
.../netty4/NettyRequestTimeoutIssueTest.java | 4 +-
.../component/netty4/NettyRequestTimeoutTest.java | 12 +-
.../component/netty4/NettyReuseChannelTest.java | 6 +-
.../component/netty4/NettyReuseConnectionTest.java | 2 +-
.../component/netty4/NettySSLClasspathTest.java | 4 +-
.../netty4/NettySSLClientCertHeadersTest.java | 4 +-
.../netty4/NettySSLConsumerClientModeTest.java | 2 +-
.../netty4/NettySSLContextParametersTest.java | 4 +-
.../netty4/NettySSLPassphaseBeanTest.java | 4 +-
.../camel/component/netty4/NettySSLTest.java | 4 +-
.../component/netty4/NettySingleCodecTest.java | 4 +-
.../component/netty4/NettySuspendResumeTest.java | 8 +-
.../camel/component/netty4/NettyTCPAsyncTest.java | 4 +-
.../component/netty4/NettyTCPChainedTest.java | 4 +-
.../netty4/NettyTCPSyncNotLazyChannelTest.java | 6 +-
.../camel/component/netty4/NettyTCPSyncTest.java | 10 +-
.../NettyTcpWithInOutUsingPlainSocketTest.java | 2 +-
.../NettyTextlineInOnlyNullDelimiterTest.java | 4 +-
.../component/netty4/NettyTextlineInOnlyTest.java | 8 +-
.../netty4/NettyTextlineInOutNonBlockingTest.java | 4 +-
.../NettyTextlineInOutSynchronousFalseTest.java | 4 +-
.../netty4/NettyTextlineInOutSynchronousTest.java | 4 +-
.../component/netty4/NettyTextlineInOutTest.java | 4 +-
.../netty4/NettyTransferExchangeOptionTest.java | 4 +-
.../camel/component/netty4/NettyUDPAsyncTest.java | 4 +-
.../netty4/NettyUDPByteArrayConsumerTest.java | 6 +-
.../netty4/NettyUDPByteArrayProviderTest.java | 2 +-
.../netty4/NettyUDPLargeMessageInOnlyTest.java | 4 +-
...yUDPMessageLargerThanDefaultBufferSizeTest.java | 4 +-
.../netty4/NettyUDPMulticastAsyncTest.java | 4 +-
.../component/netty4/NettyUDPObjectSyncTest.java | 4 +-
.../camel/component/netty4/NettyUDPSyncTest.java | 4 +-
.../netty4/NettyUdpConnectedSendTest.java | 2 +-
.../netty4/NettyUdpConnectionlessSendTest.java | 2 +-
.../NettyUdpWithInOutUsingPlainSocketTest.java | 2 +-
...ttyUseSharedWorkerThreadPoolManyRoutesTest.java | 2 +-
.../netty4/NettyUseSharedWorkerThreadPoolTest.java | 12 +-
.../org/apache/camel/component/netty4/Poetry.java | 0
.../SpringNettyUseSharedWorkerThreadPoolTest.java | 6 +-
.../netty4/UnsharableCodecsConflicts2Test.java | 2 +-
.../netty4/UnsharableCodecsConflictsTest.java | 4 +-
.../src/test/resources/keystore.jks | Bin
.../src/test/resources/log4j2.properties | 2 +-
.../SpringNettyUseSharedWorkerThreadPoolTest.xml | 6 +-
.../camel/component/netty4/multiple-codecs.xml | 4 +-
.../src/test/resources/test.txt | 0
.../src/main/docs/properties-component.adoc | 45 +--
.../properties/DefaultPropertiesParser.java | 29 +-
.../component/properties/PropertiesComponent.java | 10 +-
.../FileConsumerQuartzSchedulerRestartTest.java | 2 +-
.../quartz2/FileConsumerQuartzSchedulerTest.java | 2 +-
.../src/main/docs/rabbitmq-component.adoc | 2 +-
.../camel/component/rabbitmq/RabbitMQEndpoint.java | 7 +-
components/camel-rest-swagger/pom.xml | 2 +-
.../src/main/docs/rest-swagger-component.adoc | 14 +-
.../rest/swagger/RestSwaggerComponent.java | 33 +-
.../rest/swagger/RestSwaggerEndpoint.java | 15 +-
.../rest/swagger/RestSwaggerProducer.java | 65 +++
.../rest/swagger/RestSwaggerEndpointTest.java | 26 --
.../camel-rest/src/main/docs/rest-component.adoc | 3 +-
.../apache/camel/component/rest/RestEndpoint.java | 4 +-
components/camel-restlet/pom.xml | 2 +-
.../src/main/docs/salesforce-component.adoc | 8 +-
.../component/salesforce/SalesforceComponent.java | 42 +-
.../component/xslt/SaxonXsltFeatureRouteTest.java | 4 +-
.../apache/camel/component/seda/SedaComponent.java | 14 +-
.../camel/component/seda}/SedaConstants.java | 4 +-
.../apache/camel/component/seda/SedaEndpoint.java | 8 +-
components/camel-servlet/pom.xml | 2 +-
.../CamelCloudZookeeperServiceRegistryTest.java | 4 +-
components/camel-spring-ws/pom.xml | 2 +-
.../src/main/docs/swagger-java.adoc | 2 +-
.../apache/camel/swagger/RestSwaggerSupport.java | 2 +-
components/camel-syslog/pom.xml | 2 +-
.../src/main/docs/syslog-dataformat.adoc | 8 +-
.../component/syslog/NettyDataFormatTest.java | 4 +-
.../component/syslog/NettyManyUDPMessagesTest.java | 2 +-
.../syslog/NettyRfc5425LongMessageTest.java | 2 +-
.../camel/component/syslog/NettyRfc5425Test.java | 2 +-
.../component/syslog/applicationContext-Netty.xml | 2 +-
components/camel-telegram/pom.xml | 2 +-
.../src/main/docs/telegram-component.adoc | 4 +-
.../telegram/TelegramWebhookCallTest.java | 2 +-
.../test/blueprint/CamelBlueprintTestSupport.java | 7 +-
.../apache/camel/test/junit5/CamelTestSupport.java | 53 +--
.../org/apache/camel/test/junit5/TestSupport.java | 444 ++++++++++-----------
.../junit5/patterns/AdviceWithNotStartedTest.java | 1 +
.../test/junit5/patterns/DebugJUnit5Test.java | 6 +-
.../patterns/DebugNoLazyTypeConverterTest.java | 6 +-
.../camel/test/junit5/patterns/DebugTest.java | 6 +-
.../junit5/patterns/IsMockEndpointsFileTest.java | 2 +
.../RouteProcessorDumpRouteCoverageTest.java | 1 +
components/camel-undertow/pom.xml | 2 +-
components/camel-webhook/pom.xml | 4 +-
.../src/main/docs/webhook-component.adoc | 4 +-
.../component/webhook/WebhookConfiguration.java | 2 +-
.../camel/component/webhook/WebhookUtils.java | 2 +-
.../component/webhook/WebhookBasePathTest.java | 10 +-
.../component/webhook/WebhookHttpBindingTest.java | 6 +-
.../component/webhook/WebhookMultiRouteTest.java | 4 +-
.../camel/component/webhook/WebhookPathTest.java | 6 +-
.../src/main/docs/json-xstream-dataformat.adoc | 70 +---
.../dataformat/zipfile/ZipFileDataFormat.java | 4 +
.../zipfile/ZipFileIteratorDataFormatTest.java} | 50 ++-
components/pom.xml | 4 +-
components/readme.adoc | 8 +-
.../java/org/apache/camel/AggregationStrategy.java | 15 +
.../apache/camel/spi/RestApiConsumerFactory.java | 2 +-
.../org/apache/camel/spi/RestConfiguration.java | 2 +-
.../org/apache/camel/converter/IOConverter.java | 9 +
.../apache/camel/processor/MulticastProcessor.java | 29 +-
.../ShareUnitOfWorkAggregationStrategy.java | 10 +
.../src/main/docs/eips/multicast-eip.adoc | 5 +
.../src/main/docs/eips/recipientList-eip.adoc | 25 +-
core/camel-core/src/main/docs/eips/split-eip.adoc | 17 +-
core/camel-core/src/main/docs/eips/toD-eip.adoc | 2 +-
.../camel/builder/AggregationStrategyClause.java | 5 +
.../cloud/ServiceCallConfigurationDefinition.java | 2 +-
.../model/rest/RestConfigurationDefinition.java | 4 +-
.../component/file/FileProducerStreamTest.java | 31 +-
.../seda/SameSedaQueueSizeAndNoSizeTest.java | 5 +-
.../camel/component/seda/SedaConfigureTest.java | 3 +-
.../camel/component/seda/SedaQueueFactoryTest.java | 1 -
.../component/vm/SameVmQueueSizeAndNoSizeTest.java | 4 +-
...ticastAggregationStrategyInputExchangeTest.java | 82 ++++
...ntListAggregationStrategyInputExchangeTest.java | 80 ++++
...litterAggregationStrategyInputExchangeTest.java | 87 ++++
.../camel/support/InputStreamIteratorTest.java | 51 +++
.../endpoint/dsl/AMQPEndpointBuilderFactory.java | 60 ++-
.../dsl/ActiveMQEndpointBuilderFactory.java | 60 ++-
.../endpoint/dsl/FileEndpointBuilderFactory.java | 5 +-
.../endpoint/dsl/JmsEndpointBuilderFactory.java | 60 ++-
.../endpoint/dsl/MailEndpointBuilderFactory.java | 36 +-
.../endpoint/dsl/NettyEndpointBuilderFactory.java | 16 +-
.../dsl/NettyHttpEndpointBuilderFactory.java | 16 +-
.../dsl/RabbitMQEndpointBuilderFactory.java | 174 ++++----
.../dsl/WebhookEndpointBuilderFactory.java | 2 +-
.../camel/main/RestConfigurationProperties.java | 2 +-
.../camel-main-configuration-metadata.json | 2 +-
.../apache/camel/support/InputStreamIterator.java | 78 ++++
core/camel-util/pom.xml | 89 ++---
.../main/java/org/apache/camel/util/IOHelper.java | 24 +-
.../java/org/apache/camel/util/IOHelperTest.java | 18 +-
.../src/test/resources/log4j2.properties | 16 +-
docs/components/modules/ROOT/nav.adoc | 4 +-
.../modules/ROOT/pages/activemq-component.adoc | 8 +-
.../modules/ROOT/pages/amqp-component.adoc | 8 +-
.../modules/ROOT/pages/file-component.adoc | 3 +-
.../modules/ROOT/pages/hl7-dataformat.adoc | 10 +-
.../modules/ROOT/pages/jms-component.adoc | 12 +-
.../ROOT/pages/json-xstream-dataformat.adoc | 70 +---
.../modules/ROOT/pages/mail-component.adoc | 4 +-
.../modules/ROOT/pages/mina-component.adoc | 4 +-
.../modules/ROOT/pages/netty-component.adoc | 220 +++++-----
.../modules/ROOT/pages/netty-http-component.adoc | 126 +++---
.../modules/ROOT/pages/properties-component.adoc | 45 +--
.../modules/ROOT/pages/rabbitmq-component.adoc | 2 +-
.../modules/ROOT/pages/rest-component.adoc | 3 +-
.../modules/ROOT/pages/rest-swagger-component.adoc | 14 +-
.../modules/ROOT/pages/salesforce-component.adoc | 8 +-
.../modules/ROOT/pages/swagger-java.adoc | 2 +-
.../modules/ROOT/pages/syslog-dataformat.adoc | 8 +-
.../modules/ROOT/pages/telegram-component.adoc | 4 +-
.../modules/ROOT/pages}/test-junit5.adoc | 0
.../modules/ROOT/pages/webhook-component.adoc | 4 +-
.../ROOT/pages/asynchronous-routing-engine.adoc | 2 +-
.../ROOT/pages/camel-configuration-utilities.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 4 +-
.../modules/ROOT/pages/multicast-eip.adoc | 5 +
.../modules/ROOT/pages/recipientList-eip.adoc | 25 +-
docs/user-manual/modules/ROOT/pages/rest-dsl.adoc | 4 +-
docs/user-manual/modules/ROOT/pages/security.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/split-eip.adoc | 17 +-
docs/user-manual/modules/ROOT/pages/toD-eip.adoc | 2 +-
.../camel-example-artemis-amqp-blueprint/pom.xml | 2 +-
.../resources/OSGI-INF/blueprint/camel-context.xml | 2 +-
.../src/main/resources/features.xml | 2 +-
.../example/artemis/amqp/ArtemisAmqpIntTest.java | 2 +-
examples/camel-example-micrometer/pom.xml | 2 +-
.../example/micrometer/ScrapeRouteBuilder.java | 4 +-
.../camel-example-netty-custom-correlation/pom.xml | 2 +-
.../org/apache/camel/example/netty/MyClient.java | 2 +-
.../org/apache/camel/example/netty/MyServer.java | 2 +-
examples/camel-example-netty-http/README.md | 2 +-
examples/camel-example-netty-http/pom.xml | 2 +-
examples/camel-example-rest-producer/readme.adoc | 2 +-
parent/pom.xml | 40 +-
.../karaf/features/src/main/resources/features.xml | 60 +--
.../springboot/ActiveMQComponentConfiguration.java | 5 +-
.../springboot/AMQPComponentConfiguration.java | 5 +-
.../RestConfigurationDefinitionProperties.java | 2 +-
.../components-starter/camel-hl7-starter/pom.xml | 2 +-
.../jms/springboot/JmsComponentConfiguration.java | 15 +-
.../springboot/MailComponentConfiguration.java | 6 +-
.../pom.xml | 16 +-
.../NettyHttpComponentAutoConfiguration.java | 8 +-
.../NettyHttpComponentConfiguration.java | 6 +-
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 1 +
.../src/main/resources/META-INF/spring.provides | 2 +-
.../pom.xml | 6 +-
.../NettyComponentAutoConfiguration.java | 8 +-
.../springboot/NettyComponentConfiguration.java | 4 +-
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 1 +
.../src/main/resources/META-INF/spring.provides | 2 +-
.../src/main/resources/META-INF/LICENSE.txt | 203 ----------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../additional-spring-configuration-metadata.json | 10 -
.../Netty4HttpAutoConfigurationTest.java | 79 ----
.../netty4/http/springboot/Netty4HttpSSLTest.java | 81 ----
.../http/springboot/Netty4StarterTestHelper.java | 62 ---
.../src/test/resources/cacerts | Bin 109798 -> 0 bytes
.../src/test/resources/keystore.p12 | Bin 2574 -> 0 bytes
.../src/test/resources/logback.xml | 41 --
.../src/main/resources/META-INF/LICENSE.txt | 203 ----------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../additional-spring-configuration-metadata.json | 10 -
.../PropertiesComponentConfiguration.java | 15 +-
.../RestSwaggerComponentConfiguration.java | 12 +-
.../SalesforceComponentConfiguration.java | 26 ++
.../springboot/WebhookComponentConfiguration.java | 2 +-
platforms/spring-boot/components-starter/pom.xml | 4 +-
.../camel-spring-boot-dependencies/pom.xml | 8 +-
...Netty4HttpTest.java => CamelNettyHttpTest.java} | 6 +-
.../{CamelNetty4Test.java => CamelNettyTest.java} | 6 +-
.../camel/itest/springboot/CamelHl7Test.java | 1 -
...Netty4HttpTest.java => CamelNettyHttpTest.java} | 4 +-
.../{CamelNetty4Test.java => CamelNettyTest.java} | 4 +-
tests/camel-itest/pom.xml | 4 +-
tests/camel-jmh/pom.xml | 2 +-
.../camel/tools/apt/DocumentationHelper.java | 4 +-
.../packaging/SpringBootAutoConfigurationMojo.java | 2 +-
.../spring-boot-fix-dependencies.properties | 4 +-
.../generator/swagger/AbstractGenerateMojo.java | 2 +-
567 files changed, 2722 insertions(+), 2873 deletions(-)
rename components/{camel-netty4-http => camel-netty-http}/pom.xml (95%)
rename docs/components/modules/ROOT/pages/netty4-http-component.adoc => components/camel-netty-http/src/main/docs/netty-http-component.adoc (77%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/ChunkedHttpRequest.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/ChunkedHttpResponse.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/ContextPathMatcher.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/CustomChunkedWriteHandler.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/DefaultContextPathMatcher.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/DefaultNettySharedHttpServer.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/HttpClientInitializerFactory.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/HttpPrincipal.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/HttpServerBootstrapFactory.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/HttpServerConsumerChannelFactory.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/HttpServerInitializerFactory.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/HttpServerSharedInitializerFactory.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/JAASSecurityAuthenticator.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyChannelBufferStreamCache.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyChannelBufferStreamCacheOnCompletion.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpBinding.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java (97%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConstants.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConsumer.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConverter.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java (97%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategy.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpMessage.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedException.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpRestHeaderFilterStrategy.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSecurityConfiguration.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettySharedHttpServer.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/NettySharedHttpServerBootstrapConfiguration.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/RestContextPathMatcher.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/RestNettyHttpBinding.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticator.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/SecurityAuthenticatorSupport.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/SecurityConstraint.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/SecurityConstraintMapping.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpression.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceExpressionFactory.java (95%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpClientChannelHandler.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpRestConsumerPath.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/BaseNettyTest.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/LogCaptureAppender.java (100%)
copy components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/LogCaptureTest.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/ManagedNettyEndpointTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/MyLoginModule.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/MyRolePrincipal.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyDefaultProtocolTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorTest.java (86%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttp500ErrorThrowExceptionOnServerTest.java (88%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestAndResponseBeanTest.java (90%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestBeanTest.java (91%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpAccessHttpRequestTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthConstraintMapperTest.java (86%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java (88%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBasicAuthTest.java (87%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingPreservePostFormUrlEncodedBodyTest.java (93%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseAbsolutePathTest.java (88%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathInPostTest.java (93%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBindingUseRelativePathTest.java (89%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java (85%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeRouteUsingHttpClientTest.java (93%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCharacterEncodingTest.java (91%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientChunkedTest.java (89%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpClientExpectContinueTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCompressTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpContentTypeTest.java (91%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpConvertPayloadToInputStreamTest.java (91%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpCustomOptionsTest.java (84%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEmptyQueryParameterTest.java (85%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java (89%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueTest.java (85%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriEncodingIssueUrlDecodeDisabledTest.java (88%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpFilterCamelHeadersTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java (93%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamAsExchangeHeaderTest.java (97%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamTest.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHandle404Test.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderCaseTest.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyRemovalTest.java (88%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderFilterStrategyTest.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeaderMaxSizeTest.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpHeadersTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMapHeadersFalseTest.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpMethodRestrictTest.java (95%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOkStatusCodeTest.java (82%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOnExceptionHandledTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpOperationFailedExceptionTest.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerBridgeTest.java (81%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerConcurrentTest.java (94%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerKeepAliveTest.java (75%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerQueryParamTest.java (97%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSendEmptyHeaderTest.java (89%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSessionTest.java (83%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleGetTest.java (79%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerSimpleTest.java (89%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerThrowExceptionOnFailureTest.java (85%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerTwoParametersWithSameKeyTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerWithHeaderTest.java (84%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProtocolNoSlashTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRawQueryTest.java (97%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedeliveryTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectNoLocationTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRedirectTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRequestTimeoutTest.java (91%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestContextPathMatcherTest.java (57%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpRestOptionsAllowTest.java (91%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpReturnDataNotInputStreamConvertableTest.java (91%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLHandshakeErrorTest.java (90%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSameHostDifferentParametersTest.java (84%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAwareTest.java (81%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthConstraintMapperTest.java (86%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleBasicAuthTest.java (85%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleTest.java (89%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSimpleUriParametersTest.java (89%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpStreamCacheFileResponseTest.java (97%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResume503Test.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSuspendResumeTest.java (94%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTraceDisabledTest.java (91%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTransferExceptionTest.java (89%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesBootstrapConfigurationTest.java (87%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesMatchOnUriPrefixTest.java (79%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesStopOneRouteTest.java (80%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesTest.java (83%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpTwoRoutesValidateBootstrapConfigurationTest.java (91%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathResponseTest.java (79%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyHttpXMLXPathTest.java (79%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyMDCLoggingTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyMixedCaseHttpPathTest.java (87%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyProxyMixedCasePathTest.java (74%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyRecipientListHttpBaseTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyRequestManagementTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleDynamicURITest.java (84%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyRouteSimpleTest.java (83%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettySharedHttpServerTest.java (88%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/NettyUseRawHttpResponseTest.java (93%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/ProxyProtocolTest.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/SecurityConstraintMappingTest.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.java (78%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/cloud/Netty4HttpServiceCallRouteTest.java (94%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/CountryPojo.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestApiNettyTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithJsonTest.java (90%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeAutoWithXmlTest.java (90%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonTest.java (89%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeJsonWithContractTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeOffWithContractTest.java (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpBindingModeXmlTest.java (89%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathConfigurationTest.java (85%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpContextPathMatchGetTest.java (86%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetCorsTest.java (94%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetTest.java (86%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpGetWildcardsTest.java (85%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpOptionsTest.java (97%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPojoInOutTest.java (84%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonJaxbPojoTest.java (87%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoListTest.java (88%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostJsonPojoTest.java (87%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpPostXmlJaxbPojoTest.java (86%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyHttpVerbTest.java (97%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyMethodNotAllowedTest.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetTest.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerGetUriParameterTest.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerPutTest.java (95%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerThrowExceptionErrorTest.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestNettyProducerVerbUpperCaseTest.java (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/RestPathMatchingTest.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/UserJaxbPojo.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/UserPojo.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/UserPojoEx.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/java/org/apache/camel/component/netty4/http/rest/UserService.java (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/resources/jsse/client-keystore.jks (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/resources/jsse/client-truststore.jks (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/resources/jsse/localhost.ks (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/resources/jsse/server-keystore.jks (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/resources/jsse/server-truststore.jks (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/resources/log4j2.properties (96%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/resources/myjaas.config (100%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpBasicAuthTest.xml (92%)
rename components/{camel-netty4-http => camel-netty-http}/src/test/resources/org/apache/camel/component/netty4/http/SpringNettyHttpSSLTest.xml (95%)
rename components/{camel-netty4 => camel-netty}/pom.xml (97%)
rename docs/components/modules/ROOT/pages/netty4-component.adoc => components/camel-netty/src/main/docs/netty-component.adoc (65%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactories.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ClientInitializerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/DefaultChannelHandlerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/DefaultClientInitializerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/DefaultNettyCamelStateCorrelationManager.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyCamelState.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyCamelStateCorrelationManager.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyComponent.java (99%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyConstants.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyConsumer.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyConsumerExceptionHandler.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyConverter.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java (95%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyHelper.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyPayloadHelper.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyProducer.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyServerBossPoolBuilder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyWorkerPoolBuilder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ServerInitializerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ShareableChannelHandlerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/SharedSingletonObjectPool.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/TextLineDelimiter.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/TimeoutCorrelationManagerSupport.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDelimiterDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DelimiterBasedFrameDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/LineBasedFrameDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/ObjectDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/ObjectEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/handlers/ServerResponseFutureListener.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ssl/SSLEngineFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/data/message1.txt (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/DatagramPacketByteArrayCodecTest.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/LogCaptureAppender.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/LogCaptureTest.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java (92%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java (89%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java (97%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java (98%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java (98%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java (88%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java (91%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java (88%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java (85%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java (83%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java (99%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java (93%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java (78%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java (91%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java (85%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java (97%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java (92%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java (86%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java (89%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java (80%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java (97%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java (87%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java (83%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java (93%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java (93%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java (88%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java (88%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java (92%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java (91%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java (97%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java (93%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java (77%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/Poetry.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java (82%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java (93%)
rename components/{camel-netty4 => camel-netty}/src/test/resources/keystore.jks (100%)
rename components/{camel-netty4 => camel-netty}/src/test/resources/log4j2.properties (96%)
rename components/{camel-netty4 => camel-netty}/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml (83%)
rename components/{camel-netty4 => camel-netty}/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml (94%)
rename components/{camel-netty4 => camel-netty}/src/test/resources/test.txt (100%)
create mode 100644 components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerProducer.java
rename {core/camel-util/src/main/java/org/apache/camel/util => components/camel-seda/src/main/java/org/apache/camel/component/seda}/SedaConstants.java (96%)
copy components/{camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerRestartTest.java => camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileIteratorDataFormatTest.java} (53%)
copy components/camel-quartz/src/test/java/org/apache/camel/pollconsumer/quartz2/FileConsumerQuartzSchedulerTest.java => core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerStreamTest.java (64%)
create mode 100644 core/camel-core/src/test/java/org/apache/camel/issues/MulticastAggregationStrategyInputExchangeTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/issues/RecipientListAggregationStrategyInputExchangeTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/issues/SplitterAggregationStrategyInputExchangeTest.java
create mode 100644 core/camel-core/src/test/java/org/apache/camel/support/InputStreamIteratorTest.java
create mode 100644 core/camel-support/src/main/java/org/apache/camel/support/InputStreamIterator.java
rename components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/LogCaptureTest.java => core/camel-util/src/test/java/org/apache/camel/util/IOHelperTest.java (64%)
rename platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/application.properties => core/camel-util/src/test/resources/log4j2.properties (64%)
rename components/camel-netty4/src/main/docs/netty4-component.adoc => docs/components/modules/ROOT/pages/netty-component.adoc (65%)
rename components/camel-netty4-http/src/main/docs/netty4-http-component.adoc => docs/components/modules/ROOT/pages/netty-http-component.adoc (77%)
copy {components/camel-test-junit5/src/main/docs => docs/components/modules/ROOT/pages}/test-junit5.adoc (100%)
rename platforms/spring-boot/components-starter/{camel-netty4-http-starter => camel-netty-http-starter}/pom.xml (79%)
rename platforms/spring-boot/components-starter/{camel-netty4-http-starter => camel-netty-http-starter}/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java (95%)
rename platforms/spring-boot/components-starter/{camel-netty4-http-starter => camel-netty-http-starter}/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentConfiguration.java (99%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-netty-http-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-netty-http-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
rename platforms/spring-boot/components-starter/{camel-netty4-http-starter => camel-netty-http-starter}/src/main/resources/META-INF/spring.factories (99%)
rename platforms/spring-boot/components-starter/{camel-netty4-http-starter => camel-netty-http-starter}/src/main/resources/META-INF/spring.provides (97%)
rename platforms/spring-boot/components-starter/{camel-netty4-starter => camel-netty-starter}/pom.xml (93%)
rename platforms/spring-boot/components-starter/{camel-netty4-starter => camel-netty-starter}/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java (95%)
rename platforms/spring-boot/components-starter/{camel-netty4-starter => camel-netty-starter}/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java (99%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-netty-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-netty-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
rename platforms/spring-boot/components-starter/{camel-netty4-starter => camel-netty-starter}/src/main/resources/META-INF/spring.factories (99%)
rename platforms/spring-boot/components-starter/{camel-netty4-starter => camel-netty-starter}/src/main/resources/META-INF/spring.provides (97%)
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/LICENSE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/NOTICE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpAutoConfigurationTest.java
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4HttpSSLTest.java
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/java/org/apache/camel/component/netty4/http/springboot/Netty4StarterTestHelper.java
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/cacerts
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/keystore.p12
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-http-starter/src/test/resources/logback.xml
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/LICENSE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/NOTICE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
rename tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/{CamelNetty4HttpTest.java => CamelNettyHttpTest.java} (93%)
rename tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/{CamelNetty4Test.java => CamelNettyTest.java} (94%)
rename tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/{CamelNetty4HttpTest.java => CamelNettyHttpTest.java} (93%)
rename tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/{CamelNetty4Test.java => CamelNettyTest.java} (92%)
[camel] 01/01: CAMEL-13826: Turned TestSupport into a utility class
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13826
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9fbfea40f87a96dc43b1621ba1833a5852fb6f01
Author: aldettinger <al...@gmail.com>
AuthorDate: Thu Aug 8 20:36:35 2019 +0200
CAMEL-13826: Turned TestSupport into a utility class
---
.../apache/camel/test/junit5/CamelTestSupport.java | 53 +--
.../org/apache/camel/test/junit5/TestSupport.java | 444 ++++++++++-----------
.../junit5/patterns/AdviceWithNotStartedTest.java | 1 +
.../test/junit5/patterns/DebugJUnit5Test.java | 6 +-
.../patterns/DebugNoLazyTypeConverterTest.java | 6 +-
.../camel/test/junit5/patterns/DebugTest.java | 6 +-
.../junit5/patterns/IsMockEndpointsFileTest.java | 2 +
.../RouteProcessorDumpRouteCoverageTest.java | 1 +
8 files changed, 265 insertions(+), 254 deletions(-)
diff --git a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
index ff5c85b..d324389 100644
--- a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
+++ b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/CamelTestSupport.java
@@ -108,7 +108,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* with some routes along with a {@link org.apache.camel.ProducerTemplate} for
* use in the test case Do <tt>not</tt> use this class for Spring Boot testing.
*/
-public abstract class CamelTestSupport extends TestSupport implements BeforeEachCallback, AfterAllCallback, BeforeTestExecutionCallback, AfterTestExecutionCallback {
+public abstract class CamelTestSupport implements BeforeEachCallback, AfterAllCallback, BeforeTestExecutionCallback, AfterTestExecutionCallback {
/**
* JVM system property which can be set to true to turn on dumping route
@@ -357,9 +357,9 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
@BeforeEach
public void setUp() throws Exception {
- log.info("********************************************************************************");
- log.info("Testing: " + currentTestName + "(" + getClass().getName() + ")");
- log.info("********************************************************************************");
+ LOG.info("********************************************************************************");
+ LOG.info("Testing: " + currentTestName + "(" + getClass().getName() + ")");
+ LOG.info("********************************************************************************");
if (isCreateCamelContextPerClass()) {
INSTANCE.set(this);
@@ -421,7 +421,7 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
}
private void doSetUp() throws Exception {
- log.debug("setUp test");
+ LOG.debug("setUp test");
// jmx is enabled if we have configured to use it, or if dump route
// coverage is enabled (it requires JMX)
boolean jmx = useJmx() || isRouteCoverageEnabled();
@@ -445,7 +445,7 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
// set debugger if enabled
if (isUseDebugger()) {
if (context.getStatus().equals(ServiceStatus.Started)) {
- log.info("Cannot setting the Debugger to the starting CamelContext, stop the CamelContext now.");
+ LOG.info("Cannot setting the Debugger to the starting CamelContext, stop the CamelContext now.");
// we need to stop the context first to setup the debugger
context.stop();
}
@@ -492,7 +492,7 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
String include = getRouteFilterIncludePattern();
String exclude = getRouteFilterExcludePattern();
if (include != null || exclude != null) {
- log.info("Route filtering pattern: include={}, exclude={}", include, exclude);
+ LOG.info("Route filtering pattern: include={}, exclude={}", include, exclude);
context.getExtension(Model.class).setRouteFilterPattern(include, exclude);
}
@@ -502,23 +502,23 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
if (isUseRouteBuilder()) {
RoutesBuilder[] builders = createRouteBuilders();
for (RoutesBuilder builder : builders) {
- log.debug("Using created route builder: " + builder);
+ LOG.debug("Using created route builder: " + builder);
context.addRoutes(builder);
}
replaceFromEndpoints();
boolean skip = "true".equalsIgnoreCase(System.getProperty("skipStartingCamelContext"));
if (skip) {
- log.info("Skipping starting CamelContext as system property skipStartingCamelContext is set to be true.");
+ LOG.info("Skipping starting CamelContext as system property skipStartingCamelContext is set to be true.");
} else if (isUseAdviceWith()) {
- log.info("Skipping starting CamelContext as isUseAdviceWith is set to true.");
+ LOG.info("Skipping starting CamelContext as isUseAdviceWith is set to true.");
} else {
startCamelContext();
}
} else {
replaceFromEndpoints();
- log.debug("Using route builder from the created context: " + context);
+ LOG.debug("Using route builder from the created context: " + context);
}
- log.debug("Routing Rules are: " + context.getRoutes());
+ LOG.debug("Routing Rules are: " + context.getRoutes());
assertValidContext(context);
}
@@ -542,9 +542,9 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
public void tearDown() throws Exception {
long time = watch.taken();
- log.info("********************************************************************************");
- log.info("Testing done: " + currentTestName + "(" + getClass().getName() + ")");
- log.info("Took: " + TimeUtils.printDuration(time) + " (" + time + " millis)");
+ LOG.info("********************************************************************************");
+ LOG.info("Testing done: " + currentTestName + "(" + getClass().getName() + ")");
+ LOG.info("Took: " + TimeUtils.printDuration(time) + " (" + time + " millis)");
// if we should dump route stats, then write that to a file
if (isRouteCoverageEnabled()) {
@@ -555,7 +555,7 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
ManagedCamelContext mc = context != null ? context.getExtension(ManagedCamelContext.class) : null;
ManagedCamelContextMBean managedCamelContext = mc != null ? mc.getManagedCamelContext() : null;
if (managedCamelContext == null) {
- log.warn("Cannot dump route coverage to file as JMX is not enabled. "
+ LOG.warn("Cannot dump route coverage to file as JMX is not enabled. "
+ "Add camel-management-impl JAR as dependency and/or override useJmx() method to enable JMX in the unit test classes.");
} else {
logCoverageSummary(managedCamelContext);
@@ -568,14 +568,14 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
file.mkdirs();
file = new File(dir, name);
- log.info("Dumping route coverage to file: {}", file);
+ LOG.info("Dumping route coverage to file: {}", file);
InputStream is = new ByteArrayInputStream(combined.getBytes());
OutputStream os = new FileOutputStream(file, false);
IOHelper.copyAndCloseInput(is, os);
IOHelper.close(os);
}
}
- log.info("********************************************************************************");
+ LOG.info("********************************************************************************");
if (isCreateCamelContextPerClass()) {
// will tear down test specially in CamelTearDownRule
@@ -677,7 +677,7 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
}
builder.append(routesSummary);
- log.info(builder.toString());
+ LOG.info(builder.toString());
}
/**
@@ -953,7 +953,7 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
// jndi.properties is optional
InputStream in = getClass().getClassLoader().getResourceAsStream("jndi.properties");
if (in != null) {
- log.debug("Using jndi.properties from classpath root");
+ LOG.debug("Using jndi.properties from classpath root");
properties.load(in);
} else {
properties.put("java.naming.factory.initial", "org.apache.camel.support.jndi.CamelInitialContextFactory");
@@ -1013,7 +1013,7 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
* @return the endpoint
*/
protected Endpoint resolveMandatoryEndpoint(String uri) {
- return resolveMandatoryEndpoint(context, uri);
+ return TestSupport.resolveMandatoryEndpoint(context, uri);
}
/**
@@ -1025,7 +1025,7 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
* @return the endpoint
*/
protected <T extends Endpoint> T resolveMandatoryEndpoint(String uri, Class<T> endpointType) {
- return resolveMandatoryEndpoint(context, uri, endpointType);
+ return TestSupport.resolveMandatoryEndpoint(context, uri, endpointType);
}
/**
@@ -1055,7 +1055,8 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
* @throws NoSuchEndpointException is the mock endpoint does not exists
*/
protected MockEndpoint getMockEndpoint(String uri, boolean create) throws NoSuchEndpointException {
- // look for existing mock endpoints that have the same queue name, and to
+ // look for existing mock endpoints that have the same queue name, and
+ // to
// do that we need to normalize uri and strip out query parameters and
// whatnot
String n;
@@ -1144,7 +1145,7 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
* Creates an exchange with the given body
*/
protected Exchange createExchangeWithBody(Object body) {
- return createExchangeWithBody(context, body);
+ return TestSupport.createExchangeWithBody(context, body);
}
/**
@@ -1157,7 +1158,7 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
Expression expression = language.createExpression(expressionText);
assertNotNull(expression, "No Expression could be created for text: " + expressionText + " language: " + language);
- assertExpression(expression, exchange, expectedValue);
+ TestSupport.assertExpression(expression, exchange, expectedValue);
}
/**
@@ -1170,7 +1171,7 @@ public abstract class CamelTestSupport extends TestSupport implements BeforeEach
Predicate predicate = language.createPredicate(expressionText);
assertNotNull(predicate, "No Predicate could be created for text: " + expressionText + " language: " + language);
- assertPredicate(predicate, exchange, expected);
+ TestSupport.assertPredicate(predicate, exchange, expected);
}
/**
diff --git a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
index 47d296f..04b39b5 100644
--- a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
+++ b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
@@ -44,33 +44,37 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
- * A bunch of useful testing methods
+ * Provides utility methods for camel test purpose (builders, assertions,
+ * endpoint resolutions, file helpers).
*/
-public abstract class TestSupport {
+public final class TestSupport {
- protected static final String LS = System.lineSeparator();
private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
- protected Logger log = LoggerFactory.getLogger(getClass());
+ private TestSupport() {
+ }
+
+ // -------------------------------------------------------------------------
// Builder methods for expressions used when testing
// -------------------------------------------------------------------------
/**
- * Returns a value builder for the given header
+ * Returns a value builder for the given header.
*/
public static ValueBuilder header(String name) {
return Builder.header(name);
}
/**
- * Returns a value builder for the given exchange property
+ * Returns a value builder for the given exchange property.
*/
public static ValueBuilder exchangeProperty(String name) {
return Builder.exchangeProperty(name);
}
/**
- * Returns a predicate and value builder for the inbound body on an exchange
+ * Returns a predicate and value builder for the inbound body on an
+ * exchange.
*/
public static ValueBuilder body() {
return Builder.body();
@@ -78,134 +82,139 @@ public abstract class TestSupport {
/**
* Returns a predicate and value builder for the inbound message body as a
- * specific type
+ * specific type.
*/
public static <T> ValueBuilder bodyAs(Class<T> type) {
return Builder.bodyAs(type);
}
/**
- * Returns a value builder for the given system property
+ * Returns a value builder for the given system property.
*/
public static ValueBuilder systemProperty(String name) {
return Builder.systemProperty(name);
}
/**
- * Returns a value builder for the given system property
+ * Returns a value builder for the given system property.
*/
public static ValueBuilder systemProperty(String name, String defaultValue) {
return Builder.systemProperty(name, defaultValue);
}
+ // -----------------------------------------------------------------------
// Assertions
// -----------------------------------------------------------------------
+ /**
+ * Asserts that a given value is of an expected type.
+ */
public static <T> T assertIsInstanceOf(Class<T> expectedType, Object value) {
assertNotNull(value, "Expected an instance of type: " + expectedType.getName() + " but was null");
assertTrue(expectedType.isInstance(value), "Object should be of type " + expectedType.getName() + " but was: " + value + " with the type: " + value.getClass().getName());
return expectedType.cast(value);
}
- public static void assertEndpointUri(Endpoint endpoint, String uri) {
- assertNotNull(endpoint, "Endpoint is null when expecting endpoint for: " + uri);
- assertEquals(endpoint.getEndpointUri(), "Endpoint uri for: " + endpoint, uri);
+ /**
+ * Asserts that a given endpoint has an expected uri.
+ */
+ public static void assertEndpointUri(Endpoint endpoint, String expectedUri) {
+ assertNotNull(endpoint, "Endpoint is null when expecting endpoint for: " + expectedUri);
+ assertEquals(expectedUri, endpoint.getEndpointUri(), "Endpoint uri for: " + endpoint);
}
/**
- * Asserts the In message on the exchange contains the expected value
+ * Asserts that the In message on the exchange contains an header with a
+ * given name and expected value.
*/
- public static Object assertInMessageHeader(Exchange exchange, String name, Object expected) {
- return assertMessageHeader(exchange.getIn(), name, expected);
+ public static Object assertInMessageHeader(Exchange exchange, String headerName, Object expectedValue) {
+ return assertMessageHeader(exchange.getIn(), headerName, expectedValue);
}
/**
- * Asserts the Out message on the exchange contains the expected value
+ * Asserts that the message on the exchange contains an header with a given
+ * name and expected value.
*/
- public static Object assertOutMessageHeader(Exchange exchange, String name, Object expected) {
- return assertMessageHeader(exchange.getOut(), name, expected);
+ public static Object assertOutMessageHeader(Exchange exchange, String headerName, Object expectedValue) {
+ return assertMessageHeader(exchange.getMessage(), headerName, expectedValue);
}
/**
- * Asserts that the given exchange has an OUT message of the given body
- * value
- *
- * @param exchange the exchange which should have an OUT message
- * @param expected the expected value of the OUT message
- * @throws InvalidPayloadException is thrown if the payload is not the
- * expected class type
+ * Asserts that the given exchange has a given expectedBody on the IN
+ * message.
*/
- public static void assertInMessageBodyEquals(Exchange exchange, Object expected) throws InvalidPayloadException {
- assertNotNull(exchange, "Should have a response exchange!");
+ public static void assertInMessageBodyEquals(Exchange exchange, Object expectedBody) throws InvalidPayloadException {
+ assertNotNull(exchange, "Should have a response exchange");
- Object actual;
- if (expected == null) {
- actual = exchange.getIn().getMandatoryBody();
- assertEquals(expected, actual, "in body of: " + exchange);
+ Object actualBody;
+ if (expectedBody == null) {
+ actualBody = exchange.getIn().getMandatoryBody();
+ assertEquals(expectedBody, actualBody, "in body of: " + exchange);
} else {
- actual = exchange.getIn().getMandatoryBody(expected.getClass());
+ actualBody = exchange.getIn().getMandatoryBody(expectedBody.getClass());
}
- assertEquals(expected, actual, "in body of: " + exchange);
+ assertEquals(expectedBody, actualBody, "in body of: " + exchange);
LOG.debug("Received response: " + exchange + " with in: " + exchange.getIn());
}
/**
- * Asserts that the given exchange has an OUT message of the given body
- * value
- *
- * @param exchange the exchange which should have an OUT message
- * @param expected the expected value of the OUT message
- * @throws InvalidPayloadException is thrown if the payload is not the
- * expected class type
+ * Asserts that the given exchange has a given expectedBody on the message.
*/
- public static void assertOutMessageBodyEquals(Exchange exchange, Object expected) throws InvalidPayloadException {
+ public static void assertMessageBodyEquals(Exchange exchange, Object expectedBody) throws InvalidPayloadException {
assertNotNull(exchange, "Should have a response exchange!");
- Object actual;
- if (expected == null) {
- actual = exchange.getOut().getMandatoryBody();
- assertEquals(expected, actual, "output body of: " + exchange);
+ Object actualBody;
+ if (expectedBody == null) {
+ actualBody = exchange.getMessage().getMandatoryBody();
+ assertEquals(expectedBody, actualBody, "output body of: " + exchange);
} else {
- actual = exchange.getOut().getMandatoryBody(expected.getClass());
+ actualBody = exchange.getMessage().getMandatoryBody(expectedBody.getClass());
}
- assertEquals(expected, actual, "output body of: " + exchange);
+ assertEquals(expectedBody, actualBody, "output body of: " + exchange);
- LOG.debug("Received response: " + exchange + " with out: " + exchange.getOut());
+ LOG.debug("Received response: " + exchange + " with out: " + exchange.getMessage());
}
- public static Object assertMessageHeader(Message message, String name, Object expected) {
- Object value = message.getHeader(name);
- assertEquals(expected, value, "Header: " + name + " on Message: " + message);
- return value;
+ /**
+ * Asserts that a given message contains an header with a given name and
+ * expected value.
+ */
+ public static Object assertMessageHeader(Message message, String headerName, Object expectedValue) {
+ Object actualValue = message.getHeader(headerName);
+ assertEquals(expectedValue, actualValue, "Header: " + headerName + " on Message: " + message);
+ return actualValue;
}
/**
- * Asserts that the given expression when evaluated returns the given answer
+ * Asserts that the given expression when evaluated returns the given
+ * answer.
*/
- public static Object assertExpression(Expression expression, Exchange exchange, Object expected) {
- Object value;
- if (expected != null) {
- value = expression.evaluate(exchange, expected.getClass());
+ public static Object assertExpression(Expression expression, Exchange exchange, Object expectedAnswer) {
+ Object actualAnswer;
+ if (expectedAnswer != null) {
+ actualAnswer = expression.evaluate(exchange, expectedAnswer.getClass());
} else {
- value = expression.evaluate(exchange, Object.class);
+ actualAnswer = expression.evaluate(exchange, Object.class);
}
- LOG.debug("Evaluated expression: " + expression + " on exchange: " + exchange + " result: " + value);
+ LOG.debug("Evaluated expression: " + expression + " on exchange: " + exchange + " result: " + actualAnswer);
- assertEquals(expected, value, "Expression: " + expression + " on Exchange: " + exchange);
- return value;
+ assertEquals(expectedAnswer, actualAnswer, "Expression: " + expression + " on Exchange: " + exchange);
+ return actualAnswer;
}
/**
- * Asserts that the predicate returns the expected value on the exchange
+ * Asserts that a given predicate returns <code>true</code> on a given
+ * exchange.
*/
public static void assertPredicateMatches(Predicate predicate, Exchange exchange) {
assertPredicate(predicate, exchange, true);
}
/**
- * Asserts that the predicate returns the expected value on the exchange
+ * Asserts that a given predicate returns <code>false</code> on a given
+ * exchange.
*/
public static void assertPredicateDoesNotMatch(Predicate predicate, Exchange exchange) {
try {
@@ -217,91 +226,163 @@ public abstract class TestSupport {
}
/**
- * Asserts that the predicate returns the expected value on the exchange
+ * Asserts that the predicate returns the expected value on the exchange.
*/
- public static boolean assertPredicate(final Predicate predicate, Exchange exchange, boolean expected) {
- if (expected) {
+ public static boolean assertPredicate(final Predicate predicate, Exchange exchange, boolean expectedValue) {
+ if (expectedValue) {
PredicateAssertHelper.assertMatches(predicate, "Predicate failed: ", exchange);
}
- boolean value = predicate.matches(exchange);
+ boolean actualValue = predicate.matches(exchange);
- LOG.debug("Evaluated predicate: " + predicate + " on exchange: " + exchange + " result: " + value);
+ LOG.debug("Evaluated predicate: " + predicate + " on exchange: " + exchange + " result: " + actualValue);
- assertEquals(expected, value, "Predicate: " + predicate + " on Exchange: " + exchange);
- return value;
+ assertEquals(expectedValue, actualValue, "Predicate: " + predicate + " on Exchange: " + exchange);
+ return actualValue;
}
/**
- * Resolves an endpoint and asserts that it is found
+ * Asserts that a given list has a single element.
*/
- public static Endpoint resolveMandatoryEndpoint(CamelContext context, String uri) {
- Endpoint endpoint = context.getEndpoint(uri);
+ public static <T> T assertOneElement(List<T> list) {
+ assertEquals(1, list.size(), "Size of list should be 1: " + list);
+ return list.get(0);
+ }
- assertNotNull(endpoint, "No endpoint found for URI: " + uri);
+ /**
+ * Asserts that a given list has a given expected size.
+ */
+ public static <T> List<T> assertListSize(List<T> list, int expectedSize) {
+ return assertListSize("List", list, expectedSize);
+ }
- return endpoint;
+ /**
+ * Asserts that a list is of the given size. When the assertion is broken,
+ * the error message starts with a given prefix.
+ */
+ public static <T> List<T> assertListSize(String brokenAssertionMessagePrefix, List<T> list, int expectedSize) {
+ assertEquals(expectedSize, list.size(), brokenAssertionMessagePrefix + " should be of size: " + expectedSize + " but is: " + list);
+ return list;
}
/**
- * Resolves an endpoint and asserts that it is found
+ * Asserts that a given collection has a given size.
*/
- public static <T extends Endpoint> T resolveMandatoryEndpoint(CamelContext context, String uri, Class<T> endpointType) {
- T endpoint = context.getEndpoint(uri, endpointType);
+ public static <T> Collection<T> assertCollectionSize(Collection<T> list, int expectedSize) {
+ return assertCollectionSize("List", list, expectedSize);
+ }
- assertNotNull(endpoint, "No endpoint found for URI: " + uri);
+ /**
+ * Asserts that a given collection has a given size. When the assertion is
+ * broken, the error message starts with a given prefix.
+ */
+ public static <T> Collection<T> assertCollectionSize(String brokenAssertionMessagePrefix, Collection<T> list, int expectedSize) {
+ assertEquals(expectedSize, list.size(), brokenAssertionMessagePrefix + " should be of size: " + expectedSize + " but is: " + list);
+ return list;
+ }
- return endpoint;
+ /**
+ * Asserts that the text contains the given string.
+ *
+ * @param text the text to compare
+ * @param containedText the text which must be contained inside the other
+ * text parameter
+ */
+ public static void assertStringContains(String text, String containedText) {
+ assertNotNull(text, "Text should not be null!");
+ assertTrue(text.contains(containedText), "Text: " + text + " does not contain: " + containedText);
}
/**
- * Creates an exchange with the given body
+ * Asserts that two given directories are equal. To be used for
+ * folder/directory comparison that works across different platforms such as
+ * Window, Mac and Linux.
*/
- protected Exchange createExchangeWithBody(CamelContext camelContext, Object body) {
- Exchange exchange = new DefaultExchange(camelContext);
- Message message = exchange.getIn();
- message.setHeader("testClass", getClass().getName());
- message.setBody(body);
- return exchange;
+ public static void assertDirectoryEquals(String expected, String actual) {
+ assertDirectoryEquals(null, expected, actual);
}
- public static <T> T assertOneElement(List<T> list) {
- assertEquals(1, list.size(), "Size of list should be 1: " + list);
- return list.get(0);
+ /**
+ * Asserts that two given directories are equal. To be used for
+ * folder/directory comparison that works across different platforms such as
+ * Window, Mac and Linux.
+ */
+ public static void assertDirectoryEquals(String message, String expected, String actual) {
+ // must use single / as path separators
+ String expectedPath = expected.replace('\\', '/');
+ String actualPath = actual.replace('\\', '/');
+
+ if (message != null) {
+ assertEquals(message, expectedPath, actualPath);
+ } else {
+ assertEquals(expectedPath, actualPath);
+ }
}
/**
- * Asserts that a list is of the given size
+ * Asserts that a given directory is found in the file system.
*/
- public static <T> List<T> assertListSize(List<T> list, int size) {
- return assertListSize("List", list, size);
+ public static void assertDirectoryExists(String filename) {
+ File file = new File(filename);
+ assertTrue(file.exists(), "Directory " + filename + " should exist");
+ assertTrue(file.isDirectory(), "Directory " + filename + " should be a directory");
}
/**
- * Asserts that a list is of the given size
+ * Asserts that a given file is found in the file system.
*/
- public static <T> List<T> assertListSize(String message, List<T> list, int size) {
- assertEquals(size, list.size(), message + " should be of size: " + size + " but is: " + list);
- return list;
+ public static void assertFileExists(String filename) {
+ File file = new File(filename);
+ assertTrue(file.exists(), "File " + filename + " should exist");
+ assertTrue(file.isFile(), "File " + filename + " should be a file");
}
/**
- * Asserts that a list is of the given size
+ * Asserts that a given file is <b>not</b> found in the file system.
*/
- public static <T> Collection<T> assertCollectionSize(Collection<T> list, int size) {
- return assertCollectionSize("List", list, size);
+ public static void assertFileNotExists(String filename) {
+ File file = new File(filename);
+ assertFalse(file.exists(), "File " + filename + " should not exist");
}
+ // -----------------------------------------------------------------------
+ // Other helpers, resolution, file, getRouteList
+ // -----------------------------------------------------------------------
+
/**
- * Asserts that a list is of the given size
+ * Resolves an endpoint and asserts that it is found.
*/
- public static <T> Collection<T> assertCollectionSize(String message, Collection<T> list, int size) {
- assertEquals(size, list.size(), message + " should be of size: " + size + " but is: " + list);
- return list;
+ public static Endpoint resolveMandatoryEndpoint(CamelContext context, String endpointUri) {
+ Endpoint endpoint = context.getEndpoint(endpointUri);
+
+ assertNotNull(endpoint, "No endpoint found for URI: " + endpointUri);
+
+ return endpoint;
+ }
+
+ /**
+ * Resolves an endpoint and asserts that it is found.
+ */
+ public static <T extends Endpoint> T resolveMandatoryEndpoint(CamelContext context, String endpointUri, Class<T> endpointType) {
+ T endpoint = context.getEndpoint(endpointUri, endpointType);
+
+ assertNotNull(endpoint, "No endpoint found for URI: " + endpointUri);
+
+ return endpoint;
+ }
+
+ /**
+ * Creates an exchange with the given body.
+ */
+ public static Exchange createExchangeWithBody(CamelContext camelContext, Object body) {
+ Exchange exchange = new DefaultExchange(camelContext);
+ Message message = exchange.getIn();
+ message.setBody(body);
+ return exchange;
}
/**
* A helper method to create a list of Route objects for a given route
- * builder
+ * builder.
*/
public static List<Route> getRouteList(RouteBuilder builder) throws Exception {
CamelContext context = new DefaultCamelContext();
@@ -313,32 +394,22 @@ public abstract class TestSupport {
}
/**
- * Asserts that the text contains the given string
- *
- * @param text the text to compare
- * @param containedText the text which must be contained inside the other
- * text parameter
- */
- public static void assertStringContains(String text, String containedText) {
- assertNotNull(text, "Text should not be null!");
- assertTrue(text.contains(containedText), "Text: " + text + " does not contain: " + containedText);
- }
-
- /**
- * Recursively delete a directory, useful to zapping test data
+ * Recursively delete a directory, useful to zapping test data. Deletion
+ * will be attempted up to five time before giving up.
*
* @param file the directory to be deleted
- * @return <tt>false</tt> if error deleting directory
+ * @return <tt>false</tt> when an error occur while deleting directory
*/
public static boolean deleteDirectory(String file) {
return deleteDirectory(new File(file));
}
/**
- * Recursively delete a directory, useful to zapping test data
+ * Recursively delete a directory, useful to zapping test data. Deletion
+ * will be attempted up to five time before giving up.
*
* @param file the directory to be deleted
- * @return <tt>false</tt> if error deleting directory
+ * @return <tt>false</tt> when an error occur while deleting directory
*/
public static boolean deleteDirectory(File file) {
int tries = 0;
@@ -359,7 +430,13 @@ public abstract class TestSupport {
return !exists;
}
- private static void recursivelyDeleteDirectory(File file) {
+ /**
+ * Recursively delete a directory. Deletion will be attempted a single time
+ * before giving up.
+ *
+ * @param file the directory to be deleted
+ */
+ public static void recursivelyDeleteDirectory(File file) {
if (!file.exists()) {
return;
}
@@ -377,7 +454,7 @@ public abstract class TestSupport {
}
/**
- * create the directory
+ * Creates a given directory.
*
* @param file the directory to be created
*/
@@ -387,122 +464,39 @@ public abstract class TestSupport {
}
/**
- * To be used for folder/directory comparison that works across different
- * platforms such as Window, Mac and Linux.
- */
- public static void assertDirectoryEquals(String expected, String actual) {
- assertDirectoryEquals(null, expected, actual);
- }
-
- /**
- * To be used for folder/directory comparison that works across different
- * platforms such as Window, Mac and Linux.
- */
- public static void assertDirectoryEquals(String message, String expected, String actual) {
- // must use single / as path separators
- String expectedPath = expected.replace('\\', '/');
- String actualPath = actual.replace('\\', '/');
-
- if (message != null) {
- assertEquals(message, expectedPath, actualPath);
- } else {
- assertEquals(expectedPath, actualPath);
- }
- }
-
- /**
- * To be used to check is a directory is found in the file system
- */
- public static void assertDirectoryExists(String filename) {
- File file = new File(filename);
- assertTrue(file.exists(), "Directory " + filename + " should exist");
- assertTrue(file.isDirectory(), "Directory " + filename + " should be a directory");
- }
-
- /**
- * To be used to check is a file is found in the file system
- */
- public static void assertFileExists(String filename) {
- File file = new File(filename);
- assertTrue(file.exists(), "File " + filename + " should exist");
- assertTrue(file.isFile(), "File " + filename + " should be a file");
- }
-
- /**
- * To be used to check is a file is <b>not</b> found in the file system
- */
- public static void assertFileNotExists(String filename) {
- File file = new File(filename);
- assertFalse(file.exists(), "File " + filename + " should not exist");
- }
-
- /**
- * Is this OS the given platform.
+ * Tells whether the current Operating System is the given expected
+ * platform.
* <p/>
- * Uses <tt>os.name</tt> from the system properties to determine the OS.
+ * Uses <tt>os.name</tt> from the system properties to determine the
+ * Operating System.
*
- * @param platform such as Windows
- * @return <tt>true</tt> if its that platform.
+ * @param expectedPlatform such as Windows
+ * @return <tt>true</tt> when the current Operating System is the expected
+ * platform, <tt>false</tt> otherwise.
*/
- public static boolean isPlatform(String platform) {
+ public static boolean isPlatform(String expectedPlatform) {
String osName = System.getProperty("os.name").toLowerCase(Locale.US);
- return osName.contains(platform.toLowerCase(Locale.US));
+ return osName.contains(expectedPlatform.toLowerCase(Locale.US));
}
/**
- * Is this Java by the given vendor.
+ * Tells whether the current Java Virtual Machine has been issued by a given
+ * expected vendor.
* <p/>
* Uses <tt>java.vendor</tt> from the system properties to determine the
* vendor.
*
- * @param vendor such as IBM
- * @return <tt>true</tt> if its that vendor.
+ * @param expectedVendor such as IBM
+ * @return <tt>true</tt> when the current Java Virtual Machine has been
+ * issued by the expected vendor, <tt>false</tt> otherwise.
*/
- public static boolean isJavaVendor(String vendor) {
+ public static boolean isJavaVendor(String expectedVendor) {
String javaVendor = System.getProperty("java.vendor").toLowerCase(Locale.US);
- return javaVendor.contains(vendor.toLowerCase(Locale.US));
- }
-
- /**
- * Is this Java 1.5
- *
- * @return <tt>true</tt> if its Java 1.5, <tt>false</tt> if its not (for
- * example Java 1.6 or better)
- * @deprecated will be removed in the future as Camel requires JDK1.8+
- */
- @Deprecated
- public static boolean isJava15() {
- return getJavaMajorVersion() == 5;
- }
-
- /**
- * Is this Java 1.6
- *
- * @return <tt>true</tt> if its Java 1.6, <tt>false</tt> if its not (for
- * example Java 1.7 or better)
- * @deprecated will be removed in the future as Camel requires JDK1.8+
- */
- @Deprecated
- public static boolean isJava16() {
- return getJavaMajorVersion() == 6;
-
- }
-
- /**
- * Is this Java 1.7
- *
- * @return <tt>true</tt> if its Java 1.7, <tt>false</tt> if its not (for
- * example Java 1.6 or older)
- * @deprecated will be removed in the future as Camel requires JDK1.8+
- */
- @Deprecated
- public static boolean isJava17() {
- return getJavaMajorVersion() == 7;
-
+ return javaVendor.contains(expectedVendor.toLowerCase(Locale.US));
}
/**
- * Is this Java 1.8
+ * Tells whether the current Java version is 1.8.
*
* @return <tt>true</tt> if its Java 1.8, <tt>false</tt> if its not (for
* example Java 1.7 or older)
@@ -513,7 +507,7 @@ public abstract class TestSupport {
}
/**
- * Is this Java 1.9
+ * Tells whether the current Java version is 1.9.
*
* @return <tt>true</tt> if its Java 1.9, <tt>false</tt> if its not (for
* example Java 1.8 or older)
diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/AdviceWithNotStartedTest.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/AdviceWithNotStartedTest.java
index 68aae9c..b097165 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/AdviceWithNotStartedTest.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/AdviceWithNotStartedTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.fail;
public class AdviceWithNotStartedTest extends CamelTestSupport {
diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugJUnit5Test.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugJUnit5Test.java
index 9a6811b..183d1d7 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugJUnit5Test.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugJUnit5Test.java
@@ -22,9 +22,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DebugJUnit5Test extends CamelTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(DebugJUnit5Test.class);
+
// START SNIPPET: e1
@Override
public boolean isUseDebugger() {
@@ -38,7 +42,7 @@ public class DebugJUnit5Test extends CamelTestSupport {
// processor
// from your Java editor you can just add a breakpoint in the code line
// below
- log.info("Before " + definition + " with body " + exchange.getIn().getBody());
+ LOG.info("Before " + definition + " with body " + exchange.getIn().getBody());
}
// END SNIPPET: e1
diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugNoLazyTypeConverterTest.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugNoLazyTypeConverterTest.java
index 7584f15..a9cb78f 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugNoLazyTypeConverterTest.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugNoLazyTypeConverterTest.java
@@ -22,9 +22,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DebugNoLazyTypeConverterTest extends CamelTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(DebugNoLazyTypeConverterTest.class);
+
@Override
protected boolean isLazyLoadingTypeConverter() {
return false;
@@ -43,7 +47,7 @@ public class DebugNoLazyTypeConverterTest extends CamelTestSupport {
// processor
// from your Java editor you can just add a breakpoint in the code line
// below
- log.info("Before " + definition + " with body " + exchange.getIn().getBody());
+ LOG.info("Before " + definition + " with body " + exchange.getIn().getBody());
}
// END SNIPPET: e1
diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugTest.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugTest.java
index 38f75d5..87ae779 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugTest.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugTest.java
@@ -22,9 +22,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DebugTest extends CamelTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(DebugTest.class);
+
// START SNIPPET: e1
@Override
public boolean isUseDebugger() {
@@ -38,7 +42,7 @@ public class DebugTest extends CamelTestSupport {
// processor
// from your Java editor you can just add a breakpoint in the code line
// below
- log.info("Before " + definition + " with body " + exchange.getIn().getBody());
+ LOG.info("Before " + definition + " with body " + exchange.getIn().getBody());
}
// END SNIPPET: e1
diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsFileTest.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsFileTest.java
index 1407f13..fe621af 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsFileTest.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsFileTest.java
@@ -23,6 +23,8 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
public class IsMockEndpointsFileTest extends CamelTestSupport {
@Override
diff --git a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/RouteProcessorDumpRouteCoverageTest.java b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/RouteProcessorDumpRouteCoverageTest.java
index fe820dd..b97959c 100644
--- a/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/RouteProcessorDumpRouteCoverageTest.java
+++ b/components/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/RouteProcessorDumpRouteCoverageTest.java
@@ -22,6 +22,7 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
+import static org.apache.camel.test.junit5.TestSupport.assertFileExists;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class RouteProcessorDumpRouteCoverageTest extends CamelTestSupport {