Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
back port fix for group aggregation for Camel 2.25.x (#3514)

* CAMEL-14414: for aggregation group completion setting and removal is handled through methods to enforce code cohesion and avoid repetitions. fixed issue for CURRENT_GROUP and ALL_GROUPS flag removal. adapted documentation accordingly

* CAMEL-14414: adapted group aggregation related test to match expectation that group flags are cleaned up after processing

* CAMEL-14414: polish

    • -0
    • +2
    ./AggregateForceCompletionHeaderInAggregationStrategyTest.java
    • -1
    • +2
    ./AggregateForceCompletionHeaderTest.java
    • -0
    • +8
    ./AggregationStrategyCompleteByPropertyTest.java
  1. … 5 more files in changeset.
[CAMEL-13040] Move modules to core/ folder

    • -76
    • +0
    ./AggregateAggregationStrategyIsPredicateTest.java
    • -124
    • +0
    ./AggregateClosedCorrelationKeyTest.java
    • -57
    • +0
    ./AggregateCompleteAllOnStopTest.java
    • -54
    • +0
    ./AggregateCompletedByBatchConsumerSendEmptyMessageWhenIdleTest.java
    • -77
    • +0
    ./AggregateCompletionAwareAggregationStrategyTest.java
    • -61
    • +0
    ./AggregateCompletionIntervalTest.java
    • -70
    • +0
    ./AggregateCompletionOnNewCorrelationGroupTest.java
    • -116
    • +0
    ./AggregateCompletionOnlyOneTest.java
    • -117
    • +0
    ./AggregateCompletionOnlyTwoTest.java
    • -134
    • +0
    ./AggregateCompletionPredicateTest.java
    • -61
    • +0
    ./AggregateCompletionSizeAndBatchConsumerTest.java
    • -50
    • +0
    ./AggregateCompletionSizeExpressionAndTimeoutTest.java
    • -72
    • +0
    ./AggregateConcurrentPerCorrelationKeyTest.java
  1. … 9255 more files in changeset.
Move service helper classes into a separate package to avoid split packages for OSGi

    • -1
    • +1
    ./AggregationStrategyLifecycleTest.java
    • -1
    • +1
    ./CustomAggregationStrategyServiceTest.java
  1. … 347 more files in changeset.
Fix CS

    • -1
    • +1
    ./AggregateAggregationStrategyIsPredicateTest.java
    • -1
    • +1
    ./AggregateCompletionOnNewCorrelationGroupTest.java
    • -1
    • +1
    ./AggregateForceCompletionHeaderInAggregationStrategyTest.java
    • -1
    • +1
    ./AggregateForceCompletionHeaderTest.java
    • -1
    • +1
    ./AggregateNewExchangeAndConfirmTest.java
    • -2
    • +1
    ./AggregateProcessorTimeoutCompletionRestartTest.java
    • -1
    • +1
    ./AggregateRepositoryReturnNullTest.java
    • -1
    • +1
    ./AggregateShouldSkipFilteredExchangesTest.java
    • -4
    • +1
    ./AggregateSimpleExpressionIssueTest.java
  1. … 133 more files in changeset.
Improve aggregator to be more asynchronous and non blocking when using optimistic locking

    • -3
    • +4
    ./AggregateProcessorTimeoutCompletionRestartTest.java
  1. … 4 more files in changeset.
Move AggregationStrategy to o.a.c and simplify the api to use a single interface

    • -1
    • +1
    ./AggregateAggregationStrategyIsPredicateTest.java
    • -2
    • +2
    ./AggregateCompletionAwareAggregationStrategyTest.java
    • -1
    • +1
    ./AggregateCompletionOnNewCorrelationGroupTest.java
    • -1
    • +1
    ./AggregateForceCompletionHeaderInAggregationStrategyTest.java
    • -1
    • +1
    ./AggregateForceCompletionHeaderTest.java
    • -1
    • +1
    ./AggregateNewExchangeAndConfirmTest.java
    • -1
    • +1
    ./AggregateProcessorTimeoutCompletionRestartTest.java
    • -1
    • +1
    ./AggregateRepositoryReturnNullTest.java
    • -1
    • +1
    ./AggregateShouldSkipFilteredExchangesTest.java
    • -1
    • +1
    ./AggregateSimpleExpressionIssueTest.java
  1. … 147 more files in changeset.
Move stuff around to isolate o.a.c.util from o.a.c and o.a.c.support from o.a.c.impl

# Conflicts:

# camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpointProcessor.java

    • -2
    • +1
    ./AggregateGroupedExchangeBackwardsCompTest.java
    • -1
    • +1
    ./AggregateGroupedExchangeCompletionExpressionSizeTest.java
    • -1
    • +2
    ./AggregateProcessorTimeoutCompletionRestartTest.java
    • -1
    • +1
    ./AggregationStrategyBeanAdapterAllowNullTest.java
    • -1
    • +1
    ./AggregationStrategyBeanAdapterNonStaticMethodTest.java
    • -1
    • +1
    ./AggregationStrategyBeanAdapterOneMethodTest.java
    • -1
    • +1
    ./AggregationStrategyBeanAdapterPollEnrichTest.java
    • -1
    • +1
    ./AggregationStrategyBeanAdapterStaticMethodTest.java
    • -1
    • +1
    ./AggregationStrategyBeanAdapterTest.java
    • -1
    • +1
    ./AggregationStrategyBeanAdapterWithHeadersAndPropertiesTest.java
    • -1
    • +1
    ./AggregationStrategyBeanAdapterWithHeadersTest.java
  1. … 2731 more files in changeset.
[CAMEL-10469] Remove @version in java source code

    • -3
    • +0
    ./AggregateClosedCorrelationKeyTest.java
    • -2
    • +0
    ./AggregateCompletionIntervalTest.java
    • -3
    • +0
    ./AggregateCompletionPredicateTest.java
    • -3
    • +0
    ./AggregateConcurrentPerCorrelationKeyTest.java
    • -3
    • +0
    ./AggregateEagerCheckCompletionTest.java
    • -3
    • +0
    ./AggregateExpressionSizeFallbackTest.java
    • -3
    • +0
    ./AggregateExpressionSizeOverrideFixedTest.java
    • -3
    • +0
    ./AggregateExpressionSizeOverrideFixedTimeoutTest.java
    • -3
    • +0
    ./AggregateExpressionTimeoutFallbackTest.java
  1. … 3749 more files in changeset.
Simplify startService / stopService helpers

  1. … 60 more files in changeset.
Fixed CS issues in camel-core

    • -2
    • +2
    ./AggregateNewExchangeAndConfirmTest.java
  1. … 218 more files in changeset.
[CAMEL-12818] Remove deprecated stuff

    • -2
    • +2
    ./AggregateForceCompletionOnStopTest.java
    • -1
    • +4
    ./AggregateGroupedExchangeBackwardsCompTest.java
    • -1
    • +4
    ./AggregateGroupedExchangeCompletionExpressionSizeTest.java
    • -4
    • +4
    ./AggregateShutdownThreadPoolTest.java
    • -1
    • +1
    ./AggregateSimpleExpressionIssueTest.java
    • -1
    • +1
    ./CustomListAggregationStrategyCompletionFromBatchConsumerTest.java
  1. … 1265 more files in changeset.
CAMEL-12777 - Checkstyle issues

    • -2
    • +1
    ./AggregateAggregationStrategyIsPredicateTest.java
    • -2
    • +1
    ./AggregateClosedCorrelationKeyTest.java
    • -2
    • +1
    ./AggregateCompletedByBatchConsumerSendEmptyMessageWhenIdleTest.java
    • -2
    • +1
    ./AggregateCompletionAwareAggregationStrategyTest.java
    • -2
    • +1
    ./AggregateCompletionIntervalTest.java
    • -2
    • +1
    ./AggregateCompletionPredicateTest.java
    • -2
    • +1
    ./AggregateCompletionSizeAndBatchConsumerTest.java
    • -2
    • +1
    ./AggregateCompletionSizeExpressionAndTimeoutTest.java
    • -2
    • +1
    ./AggregateConcurrentPerCorrelationKeyTest.java
  1. … 2617 more files in changeset.
[CAMEL-12761] Fix indentation

  1. … 666 more files in changeset.
[CAMEL-12761] Switch to junit 4

    • -0
    • +3
    ./AggregateAggregationStrategyIsPredicateTest.java
    • -0
    • +4
    ./AggregateClosedCorrelationKeyTest.java
    • -0
    • +3
    ./AggregateCompletedByBatchConsumerSendEmptyMessageWhenIdleTest.java
    • -0
    • +3
    ./AggregateCompletionAwareAggregationStrategyTest.java
    • -0
    • +3
    ./AggregateCompletionIntervalTest.java
    • -0
    • +6
    ./AggregateCompletionPredicateTest.java
    • -0
    • +3
    ./AggregateCompletionSizeAndBatchConsumerTest.java
    • -0
    • +3
    ./AggregateCompletionSizeExpressionAndTimeoutTest.java
    • -0
    • +3
    ./AggregateConcurrentPerCorrelationKeyTest.java
  1. … 3165 more files in changeset.
CAMEL-12589: Fixed aggregator eip to not propgate control headers for force completion so another aggregator will not also force again.

    • -0
    • +2
    ./AggregateForceCompletionHeaderTest.java
  1. … 1 more file in changeset.
CAMEL-12589: Fixed aggregator eip to not propgate control headers for force completion so another aggregator will not also force again.

    • -0
    • +2
    ./AggregateForceCompletionHeaderTest.java
  1. … 1 more file in changeset.
CAMEL-12589: Fixed aggregator eip to not propgate control headers for force completion so another aggregator will not also force again.

    • -0
    • +2
    ./AggregateForceCompletionHeaderTest.java
  1. … 1 more file in changeset.
polish

    • -1
    • +1
    ./AggregateConcurrentPerCorrelationKeyTest.java
    • -1
    • +1
    ./AggregateExpressionSizeFallbackTest.java
    • -1
    • +1
    ./AggregateExpressionSizeOverrideFixedTest.java
    • -1
    • +1
    ./AggregateExpressionSizeOverrideFixedTimeoutTest.java
    • -1
    • +1
    ./AggregateExpressionTimeoutFallbackTest.java
    • -2
    • +2
    ./AggregateExpressionTimeoutPerGroupTest.java
    • -1
    • +1
    ./AggregateForceCompletionHeaderTest.java
    • -1
    • +1
    ./AggregateSimpleExpressionIssueTest.java
    • -1
    • +1
    ./AggregationStrategyBeanAdapterAllowNullTest.java
    • -1
    • +1
    ./CustomListAggregationStrategyEmptySplitTest.java
  1. … 438 more files in changeset.
CAMEL-12296: Aggregate EIP - Added option to complete all previous groups on new incoming group detected.

    • -0
    • +70
    ./AggregateCompletionOnNewCorrelationGroupTest.java
  1. … 5 more files in changeset.
CAMEL-10474: Aggregate EIP allow to force complete of all previous groups decided by AggregationStrategy.

    • -0
    • +72
    ./AggregateForceCompletionHeaderInAggregationStrategyTest.java
  1. … 2 more files in changeset.
replace string concatenation in log messages with placeholders

  1. … 49 more files in changeset.
CAMEL-11984: AggregationStrategy - Let EIPs inject CamelContext if CamelContextAware custom aggregation strategy to allow access to CamelContext during start/stop logic. This fixes CAMEL-11983: Fixed thread-safety issue.

    • -0
    • +102
    ./AggregationStrategyLifecycleTest.java
  1. … 7 more files in changeset.
CAMEL-11984: AggregationStrategy - Let EIPs inject CamelContext if CamelContextAware custom aggregation strategy to allow access to CamelContext during start/stop logic. This fixes CAMEL-11983: Fixed thread-safety issue.

    • -0
    • +102
    ./AggregationStrategyLifecycleTest.java
  1. … 7 more files in changeset.
CAMEL-11984: AggregationStrategy - Let EIPs inject CamelContext if CamelContextAware custom aggregation strategy to allow access to CamelContext during start/stop logic. This fixes CAMEL-11983: Fixed thread-safety issue.

    • -0
    • +102
    ./AggregationStrategyLifecycleTest.java
  1. … 7 more files in changeset.
Fixed test on slow CI box

  1. … 2 more files in changeset.
CAMEL-11446: Use awaitility for testing where we otherwise use thred sleep which can be speeded up.

  1. … 4 more files in changeset.
CAMEL-11446: Use awaitility for testing where we otherwise use thred sleep which can be speeded up.

  1. … 13 more files in changeset.
CAMEL-11446: Use awaitility for testing where we otherwise use thred sleep which can be speeded up.

    • -1
    • +1
    ./AggregatePreCompleteAwareStrategyTimeoutTest.java
    • -2
    • +3
    ./AggregateTimeoutWithExecutorServiceTest.java
    • -2
    • +3
    ./AggregateTimeoutWithNoExecutorServiceTest.java
  1. … 15 more files in changeset.
CAMEL-11446: Use awaitility for testing where we otherwise use thred sleep which can be speeded up.

    • -1
    • +1
    ./AggregateCompletedByBatchConsumerSendEmptyMessageWhenIdleTest.java
    • -0
    • +2
    ./AggregateSimpleExpressionIssueTest.java
    • -1
    • +1
    ./CustomListAggregationStrategyCompletionFromBatchConsumerTest.java
  1. … 19 more files in changeset.
correct tiny typo