This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from f19e17e3c59 Attempt at fixing website build
add 856cb25db00 CAMEL-22396: camel-core - InterceptSendToEndpoint clash
with advice with and @MockEndpoints (#19065)
No new revisions were added by this update.
Summary of changes:
.../mock/InterceptSendToMockEndpointStrategy.java | 40 +++---
components/camel-test/camel-test-junit5/pom.xml | 4 +
.../test/junit5/util/CamelContextTestHelper.java | 13 +-
.../MockEndpointsInterceptSendToEndpointTest.java} | 30 ++--
.../spring/junit5/CamelAnnotationsHandler.java | 53 ++++----
.../org/apache/camel/ExtendedCamelContext.java | 14 ++
...trategy.java => AutoMockInterceptStrategy.java} | 36 ++---
.../org/apache/camel/spi/EndpointStrategy.java | 2 +-
.../apache/camel/spi/InterceptEndpointFactory.java | 2 +-
.../apache/camel/spi/InternalProcessorFactory.java | 4 +
.../spi/MockSendToEndpointStrategyFactory.java | 4 +-
.../camel/impl/engine/AbstractCamelContext.java | 10 +-
.../impl/engine/DefaultCamelContextExtension.java | 11 ++
.../engine/DefaultInterceptEndpointFactory.java | 3 +-
.../camel/builder/AdviceWithRouteBuilder.java | 19 ++-
.../camel/processor/AutoMockInterceptProducer.java | 151 +++++++++++++++++++++
.../processor/DefaultInternalProcessorFactory.java | 24 ++++
.../org/apache/camel/processor/SendProcessor.java | 5 +-
.../java/org/apache/camel/ContextTestSupport.java | 12 +-
.../intercept/IsMockEndpointsAndSkipTest.java | 10 +-
.../intercept}/IsMockEndpointsFileTest.java | 14 +-
.../processor/intercept}/IsMockEndpointsTest.java | 6 +-
.../MockEndpointsInterceptSendToEndpointTest.java | 62 +++++++++
.../camel/management/PublishEventNotifier.java | 5 +-
....java => DefaultAutoMockInterceptStrategy.java} | 34 ++---
.../org/apache/camel/support/DeferProducer.java | 4 +-
.../camel/support/cache/DefaultProducerCache.java | 5 +-
.../camel/support/cache/EmptyProducerCache.java | 5 +-
28 files changed, 437 insertions(+), 145 deletions(-)
copy
components/{camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQConsumerIT.java
=>
camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/MockEndpointsInterceptSendToEndpointTest.java}
(60%)
copy core/camel-api/src/main/java/org/apache/camel/spi/{ReloadStrategy.java =>
AutoMockInterceptStrategy.java} (55%)
create mode 100644
core/camel-core-processor/src/main/java/org/apache/camel/processor/AutoMockInterceptProducer.java
copy
components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/IsMockEndpointsAndSkipJUnit5Test.java
=>
core/camel-core/src/test/java/org/apache/camel/processor/intercept/IsMockEndpointsAndSkipTest.java
(90%)
copy
{components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns
=>
core/camel-core/src/test/java/org/apache/camel/processor/intercept}/IsMockEndpointsFileTest.java
(78%)
copy
{components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns
=>
core/camel-core/src/test/java/org/apache/camel/processor/intercept}/IsMockEndpointsTest.java
(93%)
create mode 100644
core/camel-core/src/test/java/org/apache/camel/processor/intercept/MockEndpointsInterceptSendToEndpointTest.java
copy core/camel-support/src/main/java/org/apache/camel/support/{NoLock.java =>
DefaultAutoMockInterceptStrategy.java} (58%)