camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [camel] 11/11: Merge branch 'camel-3.x-async' into camel-3.x
Date Thu, 22 Nov 2018 16:33:28 GMT
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 93fbf291933b5cdeca452d9f8106dbf8bf0b5b19
Merge: cf33e65 cec9ef0
Author: Guillaume Nodet <gnodet@gmail.com>
AuthorDate: Thu Nov 22 17:32:11 2018 +0100

    Merge branch 'camel-3.x-async' into camel-3.x

 .../main/java/org/apache/camel/AsyncProcessor.java |    5 +
 .../camel/spi/AsyncProcessorAwaitManager.java      |   19 +-
 camel-core/pom.xml                                 |    5 +
 camel-core/src/main/docs/eips/delay-eip.adoc       |    2 +-
 .../component/bean/AbstractBeanProcessor.java      |   24 +-
 .../apache/camel/component/bean/BeanProcessor.java |    7 +
 .../apache/camel/component/file/FileConsumer.java  |   23 +-
 .../apache/camel/component/seda/SedaProducer.java  |    1 -
 .../camel/component/timer/TimerConsumer.java       |    5 +
 .../apache/camel/impl/AbstractCamelContext.java    |   87 +-
 .../impl/DefaultAsyncProcessorAwaitManager.java    |   32 +-
 .../apache/camel/impl/DefaultProducerCache.java    |   12 +-
 .../java/org/apache/camel/impl/DeferProducer.java  |    9 +
 .../impl/InterceptSendToEndpointProcessor.java     |    8 +-
 .../camel/impl/SubscribeMethodProcessor.java       |   10 +-
 .../impl/cloud/DefaultServiceCallProcessor.java    |   17 +-
 .../org/apache/camel/model/DelayDefinition.java    |   12 +-
 .../camel/processor/CamelInternalProcessor.java    |  103 +-
 .../apache/camel/processor/CamelLogProcessor.java  |   54 +-
 .../apache/camel/processor/ChoiceProcessor.java    |    9 +-
 .../camel/processor/ClaimCheckProcessor.java       |   10 +-
 .../camel/processor/ConvertBodyProcessor.java      |   38 +-
 .../camel/processor/DelayProcessorSupport.java     |   23 +-
 .../camel/processor/DelegateAsyncProcessor.java    |   24 +-
 .../camel/processor/DelegateSyncProcessor.java     |   13 +-
 .../java/org/apache/camel/processor/Enricher.java  |    9 +-
 .../processor/EvaluateExpressionProcessor.java     |   10 +-
 .../camel/processor/ExchangePatternProcessor.java  |   10 +-
 .../InterceptorToAsyncProcessorBridge.java         |   10 +
 .../org/apache/camel/processor/LogProcessor.java   |   10 +-
 .../org/apache/camel/processor/LoopProcessor.java  |  176 +-
 .../apache/camel/processor/MarshalProcessor.java   |   10 +-
 .../apache/camel/processor/MulticastProcessor.java |  794 +++------
 .../camel/processor/OnCompletionProcessor.java     |   10 +-
 .../java/org/apache/camel/processor/Pipeline.java  |  176 +-
 .../org/apache/camel/processor/PollEnricher.java   |   10 +-
 .../org/apache/camel/processor/RecipientList.java  |   10 +-
 .../camel/processor/RedeliveryErrorHandler.java    | 1769 +++++++++-----------
 .../camel/processor/RemoveHeaderProcessor.java     |   10 +-
 .../camel/processor/RemoveHeadersProcessor.java    |   10 +-
 .../camel/processor/RemovePropertiesProcessor.java |   10 +-
 .../camel/processor/RemovePropertyProcessor.java   |   10 +-
 .../org/apache/camel/processor/Resequencer.java    |   30 +-
 .../apache/camel/processor/RollbackProcessor.java  |   10 +-
 .../org/apache/camel/processor/RoutingSlip.java    |   20 +-
 .../apache/camel/processor/SamplingThrottler.java  |   19 +-
 .../apache/camel/processor/ScriptProcessor.java    |   10 +-
 .../camel/processor/SendDynamicProcessor.java      |   10 +-
 .../org/apache/camel/processor/SendProcessor.java  |   20 +-
 .../apache/camel/processor/SetBodyProcessor.java   |   10 +-
 .../apache/camel/processor/SetHeaderProcessor.java |   10 +-
 .../camel/processor/SetPropertyProcessor.java      |   10 +-
 .../processor/SharedCamelInternalProcessor.java    |   57 +-
 .../org/apache/camel/processor/SortProcessor.java  |   10 +-
 .../java/org/apache/camel/processor/Splitter.java  |   14 +-
 .../org/apache/camel/processor/StopProcessor.java  |   10 +-
 .../apache/camel/processor/StreamResequencer.java  |   10 +-
 .../apache/camel/processor/ThreadsProcessor.java   |   10 +-
 .../java/org/apache/camel/processor/Throttler.java |   11 +-
 .../apache/camel/processor/ThroughputLogger.java   |   14 +-
 .../camel/processor/ThrowExceptionProcessor.java   |   10 +-
 .../apache/camel/processor/TransformProcessor.java |   10 +-
 .../org/apache/camel/processor/TryProcessor.java   |   99 +-
 .../apache/camel/processor/UnitOfWorkProducer.java |    3 +-
 .../apache/camel/processor/UnmarshalProcessor.java |   10 +-
 .../apache/camel/processor/WireTapProcessor.java   |   31 +-
 .../processor/aggregate/AggregateProcessor.java    |  349 ++--
 .../aggregate/OptimisticLockRetryPolicy.java       |   15 +-
 .../processor/idempotent/IdempotentConsumer.java   |    9 +-
 .../processor/interceptor/DefaultChannel.java      |   13 -
 .../processor/loadbalancer/DistributionRatio.java  |   37 +-
 .../loadbalancer/FailOverLoadBalancer.java         |  214 +--
 .../camel/processor/loadbalancer/LoadBalancer.java |    6 +-
 .../loadbalancer/LoadBalancerConsumer.java         |    4 +-
 .../loadbalancer/LoadBalancerSupport.java          |   77 +-
 .../processor/loadbalancer/QueueLoadBalancer.java  |   30 +-
 .../processor/loadbalancer/RandomLoadBalancer.java |   19 +-
 .../loadbalancer/RoundRobinLoadBalancer.java       |   22 +-
 .../processor/loadbalancer/StickyLoadBalancer.java |   36 +-
 .../processor/loadbalancer/TopicLoadBalancer.java  |   50 +-
 .../loadbalancer/WeightedLoadBalancer.java         |   74 +-
 .../loadbalancer/WeightedRandomLoadBalancer.java   |   51 +-
 .../WeightedRoundRobinLoadBalancer.java            |   40 +-
 .../processor/validation/ValidatingProcessor.java  |   19 +-
 .../org/apache/camel/reifier/DelayReifier.java     |    2 +-
 .../apache/camel/reifier/LoadBalanceReifier.java   |    6 +-
 .../org/apache/camel/reifier/ProcessorReifier.java |   25 +-
 .../org/apache/camel/reifier/WireTapReifier.java   |    2 +-
 .../support/AsyncProcessorConverterHelper.java     |    9 +
 .../apache/camel/support/AsyncProcessorHelper.java |   18 +-
 .../AsyncProcessorSupport.java}                    |   52 +-
 .../apache/camel/support/DefaultAsyncProducer.java |   13 +-
 .../org/apache/camel/support/DefaultConsumer.java  |   10 +-
 .../apache/camel/support/DefaultTimeoutMap.java    |   57 +-
 .../NoLock.java}                                   |   51 +-
 .../org/apache/camel/support/ReactiveHelper.java   |  164 ++
 .../component/seda/SedaBlockWhenFullTest.java      |    4 +-
 .../seda/SedaDefaultBlockWhenFullTest.java         |    4 +-
 .../camel/impl/MultipleConsumersSupportTest.java   |    8 +
 ...ngExchangesAsyncDelayShutdownGracefulTest.java} |   31 +-
 .../impl/PendingExchangesShutdownGracefulTest.java |    2 +-
 ...ndingExchangesTwoRouteShutdownGracefulTest.java |    4 +-
 .../EventNotifierFailureHandledEventsTest.java     |    8 +-
 .../CharlesSplitAndTryCatchRollbackIssueTest.java  |    4 +-
 ...thAggregationStrategyThrowingExceptionTest.java |   11 +-
 ...terParallelRuntimeExceptionInHasNextOrNext.java |   12 -
 ...ThreadsRejectedExecutionWithDeadLetterTest.java |    4 +-
 .../apache/camel/processor/LoopAsyncCopyTest.java  |    3 -
 .../camel/processor/LoopAsyncNoCopyTest.java       |    3 -
 .../org/apache/camel/processor/MDCAsyncTest.java   |   17 +-
 .../MulticastParallelStopOnExceptionTest.java      |    3 +-
 .../processor/MulticastParallelStreamingTest.java  |    2 +-
 .../processor/MulticastStopOnExceptionTest.java    |    2 +-
 .../apache/camel/processor/NavigateRouteTest.java  |   22 +-
 ...pientListContextScopedOnExceptionIssueTest.java |    7 +
 .../processor/ShutdownCompleteAllTasksTest.java    |    2 +-
 .../ShutdownCompleteCurrentTaskOnlyTest.java       |    4 +-
 .../SplitterParallelStopOnExceptionTest.java       |    2 +-
 .../processor/SplitterStopOnExceptionTest.java     |    2 +-
 .../processor/ThreadsRejectedExecutionTest.java    |    2 +-
 .../camel/processor/UnmarshalProcessorTest.java    |    2 +
 .../aggregator/AggregateProcessorTest.java         |   45 +-
 ...egateProcessorTimeoutCompletionRestartTest.java |    7 +-
 .../async/AsyncEndpointCustomInterceptorTest.java  |    9 +-
 .../processor/async/AsyncEndpointPolicyTest.java   |   38 +-
 .../AsyncEndpointRecipientListParallel5Test.java   |    3 +-
 .../AsyncEndpointRecipientListParallelTest.java    |    3 +-
 ...syncEndpointRoutingSlipBeanNonBlockingTest.java |    8 +-
 .../routingslip/RoutingSlipEventNotifierTest.java  |    1 +
 .../java/org/apache/camel/util/FilterIterator.java |   88 +
 .../main/java/org/apache/camel/util/IOHelper.java  |   10 +-
 .../util/concurrent/AsyncCompletionService.java    |  167 ++
 .../concurrent/AsyncCompletionServiceTest.java     |  196 +++
 .../client/AbstractAtomixClientProducer.java       |    9 +-
 .../camel/component/aws/xray/XRayTracer.java       |  127 +-
 .../camel/component/aws/xray/ABCRouteTest.java     |   11 +-
 .../aws/xray/ComprehensiveTrackingTest.java        |   22 +-
 .../component/aws/xray/CustomComponentTest.java    |    5 +-
 .../aws/xray/SpringAwsXRaySimpleRouteTest.java     |   25 +-
 .../camel/component/aws/xray/TwoService2Test.java  |    7 +-
 .../camel/component/aws/xray/TwoServiceTest.java   |    5 +-
 .../src/test/resources/log4j2.properties           |   39 +
 .../component/beanstalk/BeanstalkProducer.java     |    5 +-
 .../cdi/transaction/TransactionErrorHandler.java   |    9 +
 .../apache/camel/component/cxf/CxfProducer.java    |    3 +-
 .../camel/component/cxf/jaxrs/CxfRsProducer.java   |    3 +-
 .../cxf/CxfConsumerContinuationTimeoutTest.java    |    8 +-
 .../disruptor/DisruptorConcurrentTest.java         |    4 +-
 .../docker/producer/AsyncDockerProducer.java       |    5 +-
 .../file/remote/FromFtpAsyncProcessTest.java       |    8 +-
 .../FtpShutdownCompleteCurrentTaskOnlyTest.java    |    2 +-
 .../apache/camel/component/grpc/GrpcProducer.java  |    7 +-
 .../hystrix/processor/HystrixProcessor.java        |   11 +-
 .../ignite/cache/IgniteCacheProducer.java          |    3 +-
 .../ignite/compute/IgniteComputeProducer.java      |    9 +-
 .../ignite/idgen/IgniteIdGenProducer.java          |    5 +-
 .../ignite/messaging/IgniteMessagingProducer.java  |    4 +-
 .../ignite/queue/IgniteQueueProducer.java          |    5 +-
 .../component/ignite/set/IgniteSetProducer.java    |    5 +-
 .../component/netty4/NettyRedeliveryTest.java      |    5 +-
 .../camel/component/quartz2/QuartzEndpoint.java    |    4 +-
 .../streams/util/UnwrapStreamProcessor.java        |    9 +-
 .../camel/component/event/EventEndpoint.java       |    4 +-
 .../camel/spring/spi/TransactionErrorHandler.java  |   32 +-
 .../processor/ShutdownCompleteAllTasksTest.xml     |    2 +-
 .../ShutdownCompleteCurrentTaskOnlyTest.xml        |    2 +-
 .../maven/bom/generator/BomGeneratorMojo.java      |    1 +
 .../packaging/PackageArchetypeCatalogMojo.java     |    1 +
 .../maven/packaging/PackageComponentMojo.java      |    1 +
 .../maven/packaging/PackageDataFormatMojo.java     |    1 +
 .../camel/maven/packaging/PackageLanguageMojo.java |    1 +
 .../camel/maven/packaging/PackageModelMojo.java    |    1 +
 .../camel/maven/packaging/PackageOtherMojo.java    |    1 +
 .../maven/packaging/PrepareCatalogKarafMojo.java   |    1 +
 .../camel/maven/packaging/PrepareCatalogMojo.java  |    1 +
 .../packaging/PrepareCatalogSpringBootMojo.java    |    1 +
 .../maven/packaging/PrepareComponentMojo.java      |    1 +
 .../camel/maven/packaging/PrepareExampleMojo.java  |    1 +
 .../camel/maven/packaging/PrepareReadmeMojo.java   |    1 +
 .../maven/packaging/PrepareUserGuideMojo.java      |    1 +
 .../packaging/SpringBootAutoConfigurationMojo.java |    1 +
 .../maven/packaging/SpringBootStarterMojo.java     |    1 +
 .../camel/maven/packaging/UpdateReadmeMojo.java    |    1 +
 ...pdateSpringBootAutoConfigurationReadmeMojo.java |    1 +
 .../maven/packaging/ValidateComponentMojo.java     |    1 +
 185 files changed, 3132 insertions(+), 3549 deletions(-)


Mime
View raw message