You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/04/07 16:50:42 UTC
[camel] branch errorhandler-in-dsl updated (cddc8456b93 -> b2384e61581)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch errorhandler-in-dsl
in repository https://gitbox.apache.org/repos/asf/camel.git
from cddc8456b93 CAMEL-16834: error handler in model DSL. WIP
new 130b6f14c3f CAMEL-16834: error handler in model DSL. WIP
new b2384e61581 CAMEL-16834: error handler in model DSL. WIP
The 2 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:
.../camel/component/avro/avro-http-producer.xml | 4 +-
.../camel/component/avro/avro-netty-producer.xml | 4 +-
.../camel/spring/xml/SpringErrorHandlerType.java | 16 ++--
.../spring/xml/handler/CamelNamespaceHandler.java | 12 +--
.../spring/config/DummyErrorHandlerBuilder.java | 7 +-
.../TransactionalClientDataSourceAsyncTest.java | 4 +-
.../handler/ErrorHandlerDefinitionParserTest.java | 20 ++--
...adLetterChannelRedeliveryConfigTest-context.xml | 2 +-
.../DefaultErrorHandlerConfigTest-context.xml | 2 +-
.../apache/camel/spring/config/errorHandler.xml | 2 +-
.../springTransactionalClientDataSource.xml | 2 +-
...HandlerAndContextScopedOnExceptionIssueTest.xml | 2 +-
.../processor/InheritErrorHandlerDefaultTest.xml | 2 +-
.../processor/InheritErrorHandlerFalseTest.xml | 2 +-
.../processor/InheritErrorHandlerTrueTest.xml | 2 +-
...ngDeadLetterChannelInvalidDeadLetterUriTest.xml | 2 +-
...LetterChannelInvalidOptionDeadLetterUriTest.xml | 2 +-
.../SpringDeadLetterChannelUseOriginalBodyTest.xml | 4 +-
...etterChannelUseOriginalExchangeWithFileTest.xml | 4 +-
.../camel/spring/processor/failOverLoadBalance.xml | 2 +-
...eadLetterChannelOnExceptionOnRedeliveryTest.xml | 2 +-
.../onexception/RedeliveryPolicyRefTest.xml | 2 +-
.../SpringContextScopeOnExceptionTest.xml | 2 +-
...ingOnExceptionFromChoiceUseOriginalBodyTest.xml | 2 +-
.../SpringOnExceptionUseOriginalBodyTest.xml | 2 +-
.../deadLetterChannelHandledExampleTest.xml | 2 +-
.../onExceptionNotNormalizedClassNameTest.xml | 2 +-
.../onexception/onExceptionSubRouteTest.xml | 4 +-
.../camel/spring/xml/buildCustomProcessor.xml | 2 +-
.../spring/xml/buildCustomProcessorWithFilter.xml | 2 +-
.../camel/spring/xml/buildDynamicRecipientList.xml | 2 +-
.../camel/spring/xml/buildIdempotentConsumer.xml | 2 +-
.../apache/camel/spring/xml/buildSimpleRoute.xml | 2 +-
.../spring/xml/buildSimpleRouteWithChoice.xml | 2 +-
.../xml/buildSimpleRouteWithHeaderPredicate.xml | 2 +-
.../org/apache/camel/spring/xml/buildSplitter.xml | 2 +-
.../camel/spring/xml/buildStaticRecipientList.xml | 2 +-
.../org/apache/camel/spring/xml/buildWireTap.xml | 2 +-
.../apache/camel/spring/SpringRouteBuilder.java | 14 +--
...a => LegacyTransactionErrorHandlerBuilder.java} | 15 +--
.../spi/LegacyTransactionErrorHandlerReifier.java | 3 +-
.../camel/spring/spi/SpringTransactionPolicy.java | 2 +-
.../camel/builder/DeadLetterChannelBuilder.java | 2 +-
.../camel/builder/DefaultErrorHandlerBuilder.java | 4 +-
.../camel/builder/ErrorHandlerBuilderRef.java | 4 +-
...er.java => LegacyDeadLetterChannelBuilder.java} | 12 +--
....java => LegacyDefaultErrorHandlerBuilder.java} | 103 +++++++++++----------
...Builder.java => LegacyErrorHandlerBuilder.java} | 4 +-
...rRef.java => LegacyErrorHandlerBuilderRef.java} | 12 +--
....java => LegacyErrorHandlerBuilderSupport.java} | 4 +-
...ilder.java => LegacyNoErrorHandlerBuilder.java} | 6 +-
.../camel/builder/NoErrorHandlerBuilder.java | 4 +-
52 files changed, 164 insertions(+), 160 deletions(-)
rename components/camel-spring/src/main/java/org/apache/camel/spring/spi/{TransactionErrorHandlerBuilder.java => LegacyTransactionErrorHandlerBuilder.java} (84%)
copy core/camel-core-model/src/main/java/org/apache/camel/builder/{DeadLetterChannelBuilder.java => LegacyDeadLetterChannelBuilder.java} (84%)
copy core/camel-core-model/src/main/java/org/apache/camel/builder/{DefaultErrorHandlerBuilder.java => LegacyDefaultErrorHandlerBuilder.java} (83%)
rename core/camel-core-model/src/main/java/org/apache/camel/builder/{ErrorHandlerBuilder.java => LegacyErrorHandlerBuilder.java} (85%)
copy core/camel-core-model/src/main/java/org/apache/camel/builder/{ErrorHandlerBuilderRef.java => LegacyErrorHandlerBuilderRef.java} (82%)
rename core/camel-core-model/src/main/java/org/apache/camel/builder/{ErrorHandlerBuilderSupport.java => LegacyErrorHandlerBuilderSupport.java} (85%)
copy core/camel-core-model/src/main/java/org/apache/camel/builder/{NoErrorHandlerBuilder.java => LegacyNoErrorHandlerBuilder.java} (83%)
[camel] 01/02: CAMEL-16834: error handler in model DSL. WIP
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch errorhandler-in-dsl
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 130b6f14c3f830909eabd195ab7048a4869977a9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 7 18:48:21 2022 +0200
CAMEL-16834: error handler in model DSL. WIP
---
.../camel/spring/xml/SpringErrorHandlerType.java | 16 ++--
.../spring/xml/handler/CamelNamespaceHandler.java | 12 +--
.../spring/config/DummyErrorHandlerBuilder.java | 7 +-
.../TransactionalClientDataSourceAsyncTest.java | 4 +-
.../handler/ErrorHandlerDefinitionParserTest.java | 20 ++--
...adLetterChannelRedeliveryConfigTest-context.xml | 2 +-
.../DefaultErrorHandlerConfigTest-context.xml | 2 +-
.../apache/camel/spring/config/errorHandler.xml | 2 +-
.../springTransactionalClientDataSource.xml | 2 +-
...HandlerAndContextScopedOnExceptionIssueTest.xml | 2 +-
.../processor/InheritErrorHandlerDefaultTest.xml | 2 +-
.../processor/InheritErrorHandlerFalseTest.xml | 2 +-
.../processor/InheritErrorHandlerTrueTest.xml | 2 +-
...ngDeadLetterChannelInvalidDeadLetterUriTest.xml | 2 +-
...LetterChannelInvalidOptionDeadLetterUriTest.xml | 2 +-
.../SpringDeadLetterChannelUseOriginalBodyTest.xml | 4 +-
...etterChannelUseOriginalExchangeWithFileTest.xml | 4 +-
.../camel/spring/processor/failOverLoadBalance.xml | 2 +-
...eadLetterChannelOnExceptionOnRedeliveryTest.xml | 2 +-
.../onexception/RedeliveryPolicyRefTest.xml | 2 +-
.../SpringContextScopeOnExceptionTest.xml | 2 +-
...ingOnExceptionFromChoiceUseOriginalBodyTest.xml | 2 +-
.../SpringOnExceptionUseOriginalBodyTest.xml | 2 +-
.../deadLetterChannelHandledExampleTest.xml | 2 +-
.../onExceptionNotNormalizedClassNameTest.xml | 2 +-
.../onexception/onExceptionSubRouteTest.xml | 4 +-
.../camel/spring/xml/buildCustomProcessor.xml | 2 +-
.../spring/xml/buildCustomProcessorWithFilter.xml | 2 +-
.../camel/spring/xml/buildDynamicRecipientList.xml | 2 +-
.../camel/spring/xml/buildIdempotentConsumer.xml | 2 +-
.../apache/camel/spring/xml/buildSimpleRoute.xml | 2 +-
.../spring/xml/buildSimpleRouteWithChoice.xml | 2 +-
.../xml/buildSimpleRouteWithHeaderPredicate.xml | 2 +-
.../org/apache/camel/spring/xml/buildSplitter.xml | 2 +-
.../camel/spring/xml/buildStaticRecipientList.xml | 2 +-
.../org/apache/camel/spring/xml/buildWireTap.xml | 2 +-
.../apache/camel/spring/SpringRouteBuilder.java | 14 +--
...a => LegacyTransactionErrorHandlerBuilder.java} | 15 +--
.../spi/LegacyTransactionErrorHandlerReifier.java | 3 +-
.../camel/spring/spi/SpringTransactionPolicy.java | 2 +-
.../camel/builder/DeadLetterChannelBuilder.java | 2 +-
.../camel/builder/DefaultErrorHandlerBuilder.java | 4 +-
.../camel/builder/ErrorHandlerBuilderRef.java | 4 +-
...er.java => LegacyDeadLetterChannelBuilder.java} | 12 +--
....java => LegacyDefaultErrorHandlerBuilder.java} | 103 +++++++++++----------
...Builder.java => LegacyErrorHandlerBuilder.java} | 4 +-
...rRef.java => LegacyErrorHandlerBuilderRef.java} | 12 +--
....java => LegacyErrorHandlerBuilderSupport.java} | 4 +-
...ilder.java => LegacyNoErrorHandlerBuilder.java} | 6 +-
.../camel/builder/NoErrorHandlerBuilder.java | 4 +-
50 files changed, 160 insertions(+), 156 deletions(-)
diff --git a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SpringErrorHandlerType.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SpringErrorHandlerType.java
index 2c52b55e42b..561609894e4 100644
--- a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SpringErrorHandlerType.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/SpringErrorHandlerType.java
@@ -19,11 +19,11 @@ package org.apache.camel.spring.xml;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlType;
-import org.apache.camel.builder.DeadLetterChannelBuilder;
-import org.apache.camel.builder.DefaultErrorHandlerBuilder;
-import org.apache.camel.builder.NoErrorHandlerBuilder;
+import org.apache.camel.builder.LegacyDeadLetterChannelBuilder;
+import org.apache.camel.builder.LegacyDefaultErrorHandlerBuilder;
+import org.apache.camel.builder.LegacyNoErrorHandlerBuilder;
import org.apache.camel.spi.Metadata;
-import org.apache.camel.spring.spi.TransactionErrorHandlerBuilder;
+import org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder;
/**
* Used to configure the error handler type
@@ -46,13 +46,13 @@ public enum SpringErrorHandlerType {
public Class<?> getTypeAsClass() {
switch (this) {
case DefaultErrorHandler:
- return DefaultErrorHandlerBuilder.class;
+ return LegacyDefaultErrorHandlerBuilder.class;
case DeadLetterChannel:
- return DeadLetterChannelBuilder.class;
+ return LegacyDeadLetterChannelBuilder.class;
case NoErrorHandler:
- return NoErrorHandlerBuilder.class;
+ return LegacyNoErrorHandlerBuilder.class;
case TransactionErrorHandler:
- return TransactionErrorHandlerBuilder.class;
+ return LegacyTransactionErrorHandlerBuilder.class;
default:
throw new IllegalArgumentException("Unknown error handler: " + this);
}
diff --git a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/CamelNamespaceHandler.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/CamelNamespaceHandler.java
index 9b8bd04ed9a..369089422f9 100644
--- a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/CamelNamespaceHandler.java
+++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/handler/CamelNamespaceHandler.java
@@ -32,9 +32,9 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.camel.builder.DeadLetterChannelBuilder;
-import org.apache.camel.builder.DefaultErrorHandlerBuilder;
-import org.apache.camel.builder.NoErrorHandlerBuilder;
+import org.apache.camel.builder.LegacyDeadLetterChannelBuilder;
+import org.apache.camel.builder.LegacyDefaultErrorHandlerBuilder;
+import org.apache.camel.builder.LegacyNoErrorHandlerBuilder;
import org.apache.camel.core.xml.CamelJMXAgentDefinition;
import org.apache.camel.core.xml.CamelPropertyPlaceholderDefinition;
import org.apache.camel.core.xml.CamelRouteControllerDefinition;
@@ -84,9 +84,9 @@ public class CamelNamespaceHandler extends NamespaceHandlerSupport {
static {
// legacy camel-spring-xml error-handling using its own model and parsers
- ErrorHandlerReifier.registerReifier(DeadLetterChannelBuilder.class, LegacyDeadLetterChannelReifier::new);
- ErrorHandlerReifier.registerReifier(DefaultErrorHandlerBuilder.class, LegacyDefaultErrorHandlerReifier::new);
- ErrorHandlerReifier.registerReifier(NoErrorHandlerBuilder.class, LegacyNoErrorHandlerReifier::new);
+ ErrorHandlerReifier.registerReifier(LegacyDeadLetterChannelBuilder.class, LegacyDeadLetterChannelReifier::new);
+ ErrorHandlerReifier.registerReifier(LegacyDefaultErrorHandlerBuilder.class, LegacyDefaultErrorHandlerReifier::new);
+ ErrorHandlerReifier.registerReifier(LegacyNoErrorHandlerBuilder.class, LegacyNoErrorHandlerReifier::new);
// note: spring transaction error handler is registered in camel-spring
}
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
index eef9686d033..4afea54bb2b 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/DummyErrorHandlerBuilder.java
@@ -20,13 +20,12 @@ import org.apache.camel.ErrorHandlerFactory;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.builder.ErrorHandlerBuilder;
-import org.apache.camel.builder.ErrorHandlerBuilderSupport;
+import org.apache.camel.builder.LegacyErrorHandlerBuilderSupport;
import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
import org.apache.camel.support.processor.DelegateProcessor;
import org.springframework.beans.factory.BeanNameAware;
-public class DummyErrorHandlerBuilder extends ErrorHandlerBuilderSupport implements BeanNameAware {
+public class DummyErrorHandlerBuilder extends LegacyErrorHandlerBuilderSupport implements BeanNameAware {
public static final String PROPERTY_NAME = "DummyErrorHandler";
@@ -49,7 +48,7 @@ public class DummyErrorHandlerBuilder extends ErrorHandlerBuilderSupport impleme
}
@Override
- public ErrorHandlerBuilder cloneBuilder() {
+ public DummyErrorHandlerBuilder cloneBuilder() {
DummyErrorHandlerBuilder answer = new DummyErrorHandlerBuilder();
answer.beanName = beanName;
return answer;
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
index 9af5324cec6..eed0530bcdd 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceAsyncTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.async.MyAsyncComponent;
+import org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
-import org.apache.camel.spring.spi.TransactionErrorHandlerBuilder;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -68,7 +68,7 @@ public class TransactionalClientDataSourceAsyncTest extends TransactionalClientD
// configure to use transaction error handler and pass on the required as it will fetch
// the transaction manager from it that it needs
- TransactionErrorHandlerBuilder teh = new TransactionErrorHandlerBuilder();
+ LegacyTransactionErrorHandlerBuilder teh = new LegacyTransactionErrorHandlerBuilder();
teh.setSpringTransactionPolicy(required);
errorHandler(teh);
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParserTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParserTest.java
index 61419b1a4c8..a935d17b882 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParserTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParserTest.java
@@ -17,10 +17,10 @@
package org.apache.camel.spring.xml.handler;
import org.apache.camel.Processor;
-import org.apache.camel.builder.DeadLetterChannelBuilder;
-import org.apache.camel.builder.DefaultErrorHandlerBuilder;
+import org.apache.camel.builder.LegacyDeadLetterChannelBuilder;
+import org.apache.camel.builder.LegacyDefaultErrorHandlerBuilder;
import org.apache.camel.processor.errorhandler.RedeliveryPolicy;
-import org.apache.camel.spring.spi.TransactionErrorHandlerBuilder;
+import org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder;
import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -46,7 +46,8 @@ public class ErrorHandlerDefinitionParserTest {
@Test
public void testDefaultErrorHandler() {
- DefaultErrorHandlerBuilder errorHandler = ctx.getBean("defaultErrorHandler", DefaultErrorHandlerBuilder.class);
+ LegacyDefaultErrorHandlerBuilder errorHandler
+ = ctx.getBean("defaultErrorHandler", LegacyDefaultErrorHandlerBuilder.class);
assertNotNull(errorHandler);
RedeliveryPolicy policy = errorHandler.getRedeliveryPolicy();
assertNotNull(policy);
@@ -54,14 +55,14 @@ public class ErrorHandlerDefinitionParserTest {
assertEquals(0, policy.getRedeliveryDelay(), "Wrong redeliveryDelay");
assertEquals(false, policy.isLogStackTrace(), "Wrong logStackTrace");
- errorHandler = ctx.getBean("errorHandler", DefaultErrorHandlerBuilder.class);
+ errorHandler = ctx.getBean("errorHandler", LegacyDefaultErrorHandlerBuilder.class);
assertNotNull(errorHandler);
}
@Test
public void testTransactionErrorHandler() {
- TransactionErrorHandlerBuilder errorHandler
- = ctx.getBean("transactionErrorHandler", TransactionErrorHandlerBuilder.class);
+ LegacyTransactionErrorHandlerBuilder errorHandler
+ = ctx.getBean("transactionErrorHandler", LegacyTransactionErrorHandlerBuilder.class);
assertNotNull(errorHandler);
assertNotNull(errorHandler.getTransactionTemplate());
Processor processor = errorHandler.getOnRedelivery();
@@ -70,14 +71,15 @@ public class ErrorHandlerDefinitionParserTest {
@Test
public void testTXErrorHandler() {
- TransactionErrorHandlerBuilder errorHandler = ctx.getBean("txEH", TransactionErrorHandlerBuilder.class);
+ LegacyTransactionErrorHandlerBuilder errorHandler = ctx.getBean("txEH", LegacyTransactionErrorHandlerBuilder.class);
assertNotNull(errorHandler);
assertNotNull(errorHandler.getTransactionTemplate());
}
@Test
public void testDeadLetterErrorHandler() {
- DeadLetterChannelBuilder errorHandler = ctx.getBean("deadLetterErrorHandler", DeadLetterChannelBuilder.class);
+ LegacyDeadLetterChannelBuilder errorHandler
+ = ctx.getBean("deadLetterErrorHandler", LegacyDeadLetterChannelBuilder.class);
assertNotNull(errorHandler);
assertEquals("log:dead", errorHandler.getDeadLetterUri(), "Get wrong deadletteruri");
RedeliveryPolicy policy = errorHandler.getRedeliveryPolicy();
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
index a00db7ff2ae..dfe7218c292 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DeadLetterChannelRedeliveryConfigTest-context.xml
@@ -37,7 +37,7 @@
<!-- START SNIPPET: e2 -->
<!-- here we configure our DeadLetterChannel -->
- <bean id="myDeadLetterErrorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="myDeadLetterErrorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<!-- exchanges is routed to mock:dead in cased redelivery failed -->
<property name="deadLetterUri" value="mock:dead"/>
<!-- reference the redelivery policy to use -->
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest-context.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest-context.xml
index da20fe47218..9e3723739a0 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest-context.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/DefaultErrorHandlerConfigTest-context.xml
@@ -37,7 +37,7 @@
</route>
</camelContext>
- <bean id="dlc" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="dlc" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:dead"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/errorHandler.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
index 17d9b809f6e..6dcbc74936e 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/errorHandler.xml
@@ -37,7 +37,7 @@
</route>
</camelContext>
- <bean id="deadLetterErrorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="deadLetterErrorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:exceptionProcessor"/>
<property name="redeliveryPolicy" ref="rsRedeliveryPolicyConfig"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSource.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSource.xml
index 55c754940eb..7ed583d9937 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSource.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSource.xml
@@ -25,7 +25,7 @@
<import resource="transactionalClientDataSource.xml"/>
- <bean id="errorHandler" class="org.apache.camel.spring.spi.TransactionErrorHandlerBuilder">
+ <bean id="errorHandler" class="org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder">
<property name="springTransactionPolicy" ref="PROPAGATION_REQUIRED"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
index be6f729b79d..a187136f9ff 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
@@ -49,7 +49,7 @@
</bean>
<!-- the error handler we use which is transactional -->
- <bean id="myErrorHandler" class="org.apache.camel.spring.spi.TransactionErrorHandlerBuilder">
+ <bean id="myErrorHandler" class="org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder">
<property name="transactionTemplate" ref="PROPAGATION_REQUIRES_NEW_TEMPLATE"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml
index 42800b8315a..1052b758436 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerDefaultTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:dead"/>
<property name="redeliveryPolicy" ref="myPolicy"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml
index 1d6bd1a7c97..d2c97577d10 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerFalseTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:dead"/>
<property name="redeliveryPolicy" ref="myPolicy"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml
index bad7b954fd6..79f8eb2809c 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/InheritErrorHandlerTrueTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:dead"/>
<property name="redeliveryPolicy" ref="myPolicy"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.xml
index 5ee5c1fa572..83551bd211f 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidDeadLetterUriTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="myDLC" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="myDLC" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<!-- invalid uri -->
<property name="deadLetterUri" value="xxx"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml
index 153d59160f9..21bb3aa7af2 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="myDLC" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="myDLC" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<!-- invalid option in direct uri -->
<property name="deadLetterUri" value="direct:error?foo=bar"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
index 33bdb4b3016..97f17fe3646 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalBodyTest.xml
@@ -25,7 +25,7 @@
">
<!-- START SNIPPET: e1 -->
- <bean id="a" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="a" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<!-- move failed messages to the mock:a dead letter queue -->
<property name="deadLetterUri" value="mock:a"/>
<!-- we mark all exchanges as handled when they are moved to the dead letter queue, so the client
@@ -42,7 +42,7 @@
</bean>
<!-- END SNIPPET: e1 -->
- <bean id="b" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="b" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<!-- move failed messages to the mock:b dead letter queue -->
<property name="deadLetterUri" value="mock:b"/>
<!-- we mark all exchanges as handled when they are moved to the dead letter queue, so the client
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
index 8c5efc4dc68..b1ff909e160 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelUseOriginalExchangeWithFileTest.xml
@@ -25,7 +25,7 @@
">
<!-- START SNIPPET: e1 -->
- <bean id="dead" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="dead" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<!-- move failed messages to the mock:dead dead letter queue -->
<property name="deadLetterUri" value="mock:dead"/>
<!-- we mark all exchanges as handled when they are moved to the dead letter queue, so the client
@@ -42,7 +42,7 @@
</bean>
<!-- END SNIPPET: e1 -->
- <bean id="b" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="b" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<!-- move failed messages to the mock:b dead letter queue -->
<property name="deadLetterUri" value="mock:b"/>
<!-- we mark all exchanges as handled when they are moved to the dead letter queue, so the client
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml
index 0f2c4944e11..b99ae3d9115 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/failOverLoadBalance.xml
@@ -64,7 +64,7 @@
</route>
</camelContext>
- <bean id="noErrorHandler" class="org.apache.camel.builder.NoErrorHandlerBuilder"/>
+ <bean id="noErrorHandler" class="org.apache.camel.builder.LegacyNoErrorHandlerBuilder"/>
<bean id="myExceptionProcessor" class="org.apache.camel.processor.FailOverLoadBalanceTest$MyExceptionProcessor"/>
<bean id="myAnotherExceptionProcessor" class="org.apache.camel.processor.FailOverLoadBalanceTest$MyAnotherExceptionProcessor"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
index dec27a3e811..5289a10386c 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="deadLetterErrorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="deadLetterErrorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
<property name="onRedelivery" ref="myRedeliveryProcessor"/>
<property name="redeliveryPolicy" ref="redeliveryPolicy"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml
index ebb90ea124c..e9f65e26a89 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml
@@ -27,7 +27,7 @@
<!-- START SNIPPET: e1 -->
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.xml
index 5cec1327bf3..4d3bf188927 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringContextScopeOnExceptionTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="deadLetter" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="deadLetter" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:dead"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml
index b7793ede686..d3fa0ca2b3b 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionFromChoiceUseOriginalBodyTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="deadLetter" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="deadLetter" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml
index 23859c3d0e0..7f01bb68ba1 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalBodyTest.xml
@@ -24,7 +24,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="deadLetter" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="deadLetter" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:dead"/>
<property name="redeliveryPolicy" ref="myRedeliveryPolicy"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml
index 20372236dbc..8e3cdf2816a 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/deadLetterChannelHandledExampleTest.xml
@@ -26,7 +26,7 @@
<!-- START SNIPPET: e1 -->
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionNotNormalizedClassNameTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionNotNormalizedClassNameTest.xml
index 4faa08d7fa6..02841b2ebb7 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionNotNormalizedClassNameTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionNotNormalizedClassNameTest.xml
@@ -27,7 +27,7 @@
<bean id="orderService" class="org.apache.camel.spring.processor.onexception.OrderService" />
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml
index 1bce864089e..df6ad437b73 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/onexception/onExceptionSubRouteTest.xml
@@ -26,12 +26,12 @@
<!-- START SNIPPET: e1 -->
<!-- setup our error handler as the deal letter channel -->
- <bean id="deadLetter" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="deadLetter" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:dead"/>
</bean>
<!-- the default error handler used in the 2nd route -->
- <bean id="defaultErrorHandler" class="org.apache.camel.builder.DefaultErrorHandlerBuilder"/>
+ <bean id="defaultErrorHandler" class="org.apache.camel.builder.LegacyDefaultErrorHandlerBuilder"/>
<!-- this is our POJO bean with our business logic defined as a plain spring bean -->
<bean id="orderService" class="org.apache.camel.spring.processor.onexception.OrderService"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml
index e30f45974a7..8471ddf2960 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml
@@ -25,7 +25,7 @@
">
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml
index eaf536f453c..c9782aeb0c4 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml
@@ -25,7 +25,7 @@
">
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml
index 285c6cb26fb..442b88bcb45 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml
@@ -25,7 +25,7 @@
">
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml
index be0e11409df..d55c9ca2d67 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml
@@ -25,7 +25,7 @@
">
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml
index be0e11409df..d55c9ca2d67 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml
@@ -25,7 +25,7 @@
">
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml
index 1ef6831a103..b89ce8662aa 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml
@@ -25,7 +25,7 @@
">
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml
index b14a0ba4591..686c7d7c7fb 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml
@@ -25,7 +25,7 @@
">
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
index 4e2ce182782..87b06a0cd4c 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
@@ -25,7 +25,7 @@
">
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml
index 7d0757add11..c5a74a0a620 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml
@@ -25,7 +25,7 @@
">
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml
index d100e745fc1..96a1117656b 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml
@@ -25,7 +25,7 @@
">
<!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="errorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:error"/>
</bean>
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
index e708a6e3074..16b5f9b22ad 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
@@ -18,8 +18,8 @@ package org.apache.camel.spring;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
-import org.apache.camel.spring.spi.TransactionErrorHandlerBuilder;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.transaction.PlatformTransactionManager;
@@ -90,8 +90,8 @@ public abstract class SpringRouteBuilder extends RouteBuilder implements Applica
*
* @return the created error handler
*/
- public TransactionErrorHandlerBuilder transactionErrorHandler() {
- return new TransactionErrorHandlerBuilder();
+ public LegacyTransactionErrorHandlerBuilder transactionErrorHandler() {
+ return new LegacyTransactionErrorHandlerBuilder();
}
/**
@@ -100,7 +100,7 @@ public abstract class SpringRouteBuilder extends RouteBuilder implements Applica
* @param policy using this transaction policy (eg: required, supports, ...)
* @return the created error handler
*/
- public TransactionErrorHandlerBuilder transactionErrorHandler(SpringTransactionPolicy policy) {
+ public LegacyTransactionErrorHandlerBuilder transactionErrorHandler(SpringTransactionPolicy policy) {
return transactionErrorHandler(policy.getTransactionTemplate());
}
@@ -110,8 +110,8 @@ public abstract class SpringRouteBuilder extends RouteBuilder implements Applica
* @param template the spring transaction template
* @return the created error handler
*/
- public TransactionErrorHandlerBuilder transactionErrorHandler(TransactionTemplate template) {
- TransactionErrorHandlerBuilder answer = new TransactionErrorHandlerBuilder();
+ public LegacyTransactionErrorHandlerBuilder transactionErrorHandler(TransactionTemplate template) {
+ LegacyTransactionErrorHandlerBuilder answer = new LegacyTransactionErrorHandlerBuilder();
answer.setTransactionTemplate(template);
return answer;
}
@@ -122,7 +122,7 @@ public abstract class SpringRouteBuilder extends RouteBuilder implements Applica
* @param transactionManager the spring transaction manager
* @return the created error handler
*/
- public TransactionErrorHandlerBuilder transactionErrorHandler(PlatformTransactionManager transactionManager) {
+ public LegacyTransactionErrorHandlerBuilder transactionErrorHandler(PlatformTransactionManager transactionManager) {
TransactionTemplate template = new TransactionTemplate(transactionManager);
return transactionErrorHandler(template);
}
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/LegacyTransactionErrorHandlerBuilder.java
similarity index 84%
rename from components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
rename to components/camel-spring/src/main/java/org/apache/camel/spring/spi/LegacyTransactionErrorHandlerBuilder.java
index e718c44e0c4..21fb01323df 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/LegacyTransactionErrorHandlerBuilder.java
@@ -17,7 +17,7 @@
package org.apache.camel.spring.spi;
import org.apache.camel.LoggingLevel;
-import org.apache.camel.builder.DefaultErrorHandlerBuilder;
+import org.apache.camel.builder.LegacyDefaultErrorHandlerBuilder;
import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
import org.apache.camel.spi.CamelLogger;
import org.slf4j.Logger;
@@ -29,19 +29,20 @@ import org.springframework.transaction.support.TransactionTemplate;
* A transactional error handler that supports leveraging Spring TransactionManager.
*/
@Deprecated
-public class TransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilder {
+public class LegacyTransactionErrorHandlerBuilder extends LegacyDefaultErrorHandlerBuilder {
static {
// legacy camel-spring-xml error-handling using its own model and parsers
- ErrorHandlerReifier.registerReifier(TransactionErrorHandlerBuilder.class, LegacyTransactionErrorHandlerReifier::new);
+ ErrorHandlerReifier.registerReifier(LegacyTransactionErrorHandlerBuilder.class,
+ LegacyTransactionErrorHandlerReifier::new);
}
- private static final Logger LOG = LoggerFactory.getLogger(TransactionErrorHandlerBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LegacyTransactionErrorHandlerBuilder.class);
private static final String PROPAGATION_REQUIRED = "PROPAGATION_REQUIRED";
private TransactionTemplate transactionTemplate;
private LoggingLevel rollbackLoggingLevel = LoggingLevel.WARN;
- public TransactionErrorHandlerBuilder() {
+ public LegacyTransactionErrorHandlerBuilder() {
// no-arg constructor used by Spring DSL
}
@@ -91,7 +92,7 @@ public class TransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilder {
*
* @param rollbackLoggingLevel the logging level
*/
- public TransactionErrorHandlerBuilder rollbackLoggingLevel(LoggingLevel rollbackLoggingLevel) {
+ public LegacyTransactionErrorHandlerBuilder rollbackLoggingLevel(LoggingLevel rollbackLoggingLevel) {
setRollbackLoggingLevel(rollbackLoggingLevel);
return this;
}
@@ -106,7 +107,7 @@ public class TransactionErrorHandlerBuilder extends DefaultErrorHandlerBuilder {
@Override
public String toString() {
- return "TransactionErrorHandlerBuilder";
+ return "LegacyTransactionErrorHandlerBuilder";
}
}
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/LegacyTransactionErrorHandlerReifier.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/LegacyTransactionErrorHandlerReifier.java
index 75a52cf4bfa..2e9e62f95c0 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/LegacyTransactionErrorHandlerReifier.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/LegacyTransactionErrorHandlerReifier.java
@@ -35,7 +35,8 @@ import static org.apache.camel.model.TransactedDefinition.PROPAGATION_REQUIRED;
* Legacy error handler for XML DSL in camel-spring-xml/camel-blueprint
*/
@Deprecated
-public class LegacyTransactionErrorHandlerReifier extends LegacyDefaultErrorHandlerReifier<TransactionErrorHandlerBuilder> {
+public class LegacyTransactionErrorHandlerReifier
+ extends LegacyDefaultErrorHandlerReifier<LegacyTransactionErrorHandlerBuilder> {
private static final Logger LOG = LoggerFactory.getLogger(LegacyTransactionErrorHandlerReifier.class);
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
index 2270d1ee097..3611d689b62 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
@@ -101,7 +101,7 @@ public class SpringTransactionPolicy implements TransactedPolicy {
} else {
LOG.debug("No ErrorHandlerBuilder configured, will use default TransactionErrorHandlerBuilder settings");
}
- TransactionErrorHandlerBuilder txBuilder = new TransactionErrorHandlerBuilder();
+ LegacyTransactionErrorHandlerBuilder txBuilder = new LegacyTransactionErrorHandlerBuilder();
txBuilder.setTransactionTemplate(getTransactionTemplate());
txBuilder.setSpringTransactionPolicy(this);
if (builder != null) {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
index 1de6c889173..d7fb0e185be 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
@@ -53,7 +53,7 @@ public class DeadLetterChannelBuilder extends DefaultErrorHandlerBuilder impleme
}
@Override
- public ErrorHandlerBuilder cloneBuilder() {
+ public LegacyErrorHandlerBuilder cloneBuilder() {
DeadLetterChannelBuilder answer = new DeadLetterChannelBuilder();
super.cloneBuilder(answer);
return answer;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
index 2cf152afeab..5248bfb4c60 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
* Legacy error handler for XML DSL in camel-spring-xml/camel-blueprint
*/
@Deprecated
-public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport implements DefaultErrorHandlerProperties {
+public class DefaultErrorHandlerBuilder extends LegacyErrorHandlerBuilderSupport implements DefaultErrorHandlerProperties {
private final DefaultErrorHandlerConfiguration configuration;
@@ -54,7 +54,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
}
@Override
- public ErrorHandlerBuilder cloneBuilder() {
+ public LegacyErrorHandlerBuilder cloneBuilder() {
DefaultErrorHandlerBuilder answer = new DefaultErrorHandlerBuilder();
cloneBuilder(answer);
return answer;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
index 5ee318f8d7e..f3f40304231 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
@@ -23,7 +23,7 @@ import org.apache.camel.model.errorhandler.ErrorHandlerRefProperties;
* Legacy error handler for XML DSL in camel-spring-xml/camel-blueprint
*/
@Deprecated
-public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport implements ErrorHandlerRefProperties {
+public class ErrorHandlerBuilderRef extends LegacyErrorHandlerBuilderSupport implements ErrorHandlerRefProperties {
public static final String DEFAULT_ERROR_HANDLER_BUILDER = ErrorHandlerRefProperties.DEFAULT_ERROR_HANDLER_BUILDER;
@@ -42,7 +42,7 @@ public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport implement
}
@Override
- public ErrorHandlerBuilder cloneBuilder() {
+ public LegacyErrorHandlerBuilder cloneBuilder() {
ErrorHandlerBuilderRef answer = new ErrorHandlerBuilderRef(configuration.getRef());
cloneBuilder(answer);
return answer;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyDeadLetterChannelBuilder.java
similarity index 84%
copy from core/camel-core-model/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
copy to core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyDeadLetterChannelBuilder.java
index 1de6c889173..10d70ef104e 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyDeadLetterChannelBuilder.java
@@ -29,19 +29,19 @@ import org.slf4j.LoggerFactory;
* Legacy error handler for XML DSL in camel-spring-xml/camel-blueprint
*/
@Deprecated
-public class DeadLetterChannelBuilder extends DefaultErrorHandlerBuilder implements DeadLetterChannelProperties {
+public class LegacyDeadLetterChannelBuilder extends DefaultErrorHandlerBuilder implements DeadLetterChannelProperties {
- public DeadLetterChannelBuilder() {
+ public LegacyDeadLetterChannelBuilder() {
// no-arg constructor used by Spring DSL
}
- public DeadLetterChannelBuilder(Endpoint deadLetter) {
+ public LegacyDeadLetterChannelBuilder(Endpoint deadLetter) {
setDeadLetterUri(deadLetter.getEndpointUri());
// DLC do not log exhausted by default
getRedeliveryPolicy().setLogExhausted(false);
}
- public DeadLetterChannelBuilder(String uri) {
+ public LegacyDeadLetterChannelBuilder(String uri) {
setDeadLetterUri(uri);
// DLC do not log exhausted by default
getRedeliveryPolicy().setLogExhausted(false);
@@ -53,8 +53,8 @@ public class DeadLetterChannelBuilder extends DefaultErrorHandlerBuilder impleme
}
@Override
- public ErrorHandlerBuilder cloneBuilder() {
- DeadLetterChannelBuilder answer = new DeadLetterChannelBuilder();
+ public LegacyErrorHandlerBuilder cloneBuilder() {
+ LegacyDeadLetterChannelBuilder answer = new LegacyDeadLetterChannelBuilder();
super.cloneBuilder(answer);
return answer;
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyDefaultErrorHandlerBuilder.java
similarity index 83%
copy from core/camel-core-model/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
copy to core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyDefaultErrorHandlerBuilder.java
index 2cf152afeab..d8888ec2f4a 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyDefaultErrorHandlerBuilder.java
@@ -36,11 +36,12 @@ import org.slf4j.LoggerFactory;
* Legacy error handler for XML DSL in camel-spring-xml/camel-blueprint
*/
@Deprecated
-public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport implements DefaultErrorHandlerProperties {
+public class LegacyDefaultErrorHandlerBuilder extends LegacyErrorHandlerBuilderSupport
+ implements DefaultErrorHandlerProperties {
private final DefaultErrorHandlerConfiguration configuration;
- public DefaultErrorHandlerBuilder() {
+ public LegacyDefaultErrorHandlerBuilder() {
configuration = createConfiguration();
}
@@ -54,13 +55,13 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
}
@Override
- public ErrorHandlerBuilder cloneBuilder() {
- DefaultErrorHandlerBuilder answer = new DefaultErrorHandlerBuilder();
+ public LegacyErrorHandlerBuilder cloneBuilder() {
+ LegacyDefaultErrorHandlerBuilder answer = new LegacyDefaultErrorHandlerBuilder();
cloneBuilder(answer);
return answer;
}
- protected void cloneBuilder(DefaultErrorHandlerBuilder other) {
+ protected void cloneBuilder(LegacyDefaultErrorHandlerBuilder other) {
other.setLogger(configuration.getLogger());
if (configuration.getRedeliveryPolicy() != null) {
other.setRedeliveryPolicy(configuration.getRedeliveryPolicy().copy());
@@ -83,107 +84,107 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
// Builder methods
// -------------------------------------------------------------------------
- public DefaultErrorHandlerBuilder backOffMultiplier(double backOffMultiplier) {
+ public LegacyDefaultErrorHandlerBuilder backOffMultiplier(double backOffMultiplier) {
getRedeliveryPolicy().backOffMultiplier(backOffMultiplier);
return this;
}
- public DefaultErrorHandlerBuilder collisionAvoidancePercent(double collisionAvoidancePercent) {
+ public LegacyDefaultErrorHandlerBuilder collisionAvoidancePercent(double collisionAvoidancePercent) {
getRedeliveryPolicy().collisionAvoidancePercent(collisionAvoidancePercent);
return this;
}
- public DefaultErrorHandlerBuilder redeliveryDelay(long delay) {
+ public LegacyDefaultErrorHandlerBuilder redeliveryDelay(long delay) {
getRedeliveryPolicy().redeliveryDelay(delay);
return this;
}
- public DefaultErrorHandlerBuilder delayPattern(String delayPattern) {
+ public LegacyDefaultErrorHandlerBuilder delayPattern(String delayPattern) {
getRedeliveryPolicy().delayPattern(delayPattern);
return this;
}
- public DefaultErrorHandlerBuilder maximumRedeliveries(int maximumRedeliveries) {
+ public LegacyDefaultErrorHandlerBuilder maximumRedeliveries(int maximumRedeliveries) {
getRedeliveryPolicy().maximumRedeliveries(maximumRedeliveries);
return this;
}
- public DefaultErrorHandlerBuilder disableRedelivery() {
+ public LegacyDefaultErrorHandlerBuilder disableRedelivery() {
getRedeliveryPolicy().maximumRedeliveries(0);
return this;
}
- public DefaultErrorHandlerBuilder maximumRedeliveryDelay(long maximumRedeliveryDelay) {
+ public LegacyDefaultErrorHandlerBuilder maximumRedeliveryDelay(long maximumRedeliveryDelay) {
getRedeliveryPolicy().maximumRedeliveryDelay(maximumRedeliveryDelay);
return this;
}
- public DefaultErrorHandlerBuilder useCollisionAvoidance() {
+ public LegacyDefaultErrorHandlerBuilder useCollisionAvoidance() {
getRedeliveryPolicy().useCollisionAvoidance();
return this;
}
- public DefaultErrorHandlerBuilder useExponentialBackOff() {
+ public LegacyDefaultErrorHandlerBuilder useExponentialBackOff() {
getRedeliveryPolicy().useExponentialBackOff();
return this;
}
- public DefaultErrorHandlerBuilder retriesExhaustedLogLevel(LoggingLevel retriesExhaustedLogLevel) {
+ public LegacyDefaultErrorHandlerBuilder retriesExhaustedLogLevel(LoggingLevel retriesExhaustedLogLevel) {
getRedeliveryPolicy().setRetriesExhaustedLogLevel(retriesExhaustedLogLevel);
return this;
}
- public DefaultErrorHandlerBuilder retryAttemptedLogLevel(LoggingLevel retryAttemptedLogLevel) {
+ public LegacyDefaultErrorHandlerBuilder retryAttemptedLogLevel(LoggingLevel retryAttemptedLogLevel) {
getRedeliveryPolicy().setRetryAttemptedLogLevel(retryAttemptedLogLevel);
return this;
}
- public DefaultErrorHandlerBuilder retryAttemptedLogInterval(int retryAttemptedLogInterval) {
+ public LegacyDefaultErrorHandlerBuilder retryAttemptedLogInterval(int retryAttemptedLogInterval) {
getRedeliveryPolicy().setRetryAttemptedLogInterval(retryAttemptedLogInterval);
return this;
}
- public DefaultErrorHandlerBuilder logStackTrace(boolean logStackTrace) {
+ public LegacyDefaultErrorHandlerBuilder logStackTrace(boolean logStackTrace) {
getRedeliveryPolicy().setLogStackTrace(logStackTrace);
return this;
}
- public DefaultErrorHandlerBuilder logRetryStackTrace(boolean logRetryStackTrace) {
+ public LegacyDefaultErrorHandlerBuilder logRetryStackTrace(boolean logRetryStackTrace) {
getRedeliveryPolicy().setLogRetryStackTrace(logRetryStackTrace);
return this;
}
- public DefaultErrorHandlerBuilder logHandled(boolean logHandled) {
+ public LegacyDefaultErrorHandlerBuilder logHandled(boolean logHandled) {
getRedeliveryPolicy().setLogHandled(logHandled);
return this;
}
- public DefaultErrorHandlerBuilder logNewException(boolean logNewException) {
+ public LegacyDefaultErrorHandlerBuilder logNewException(boolean logNewException) {
getRedeliveryPolicy().setLogNewException(logNewException);
return this;
}
- public DefaultErrorHandlerBuilder logExhausted(boolean logExhausted) {
+ public LegacyDefaultErrorHandlerBuilder logExhausted(boolean logExhausted) {
getRedeliveryPolicy().setLogExhausted(logExhausted);
return this;
}
- public DefaultErrorHandlerBuilder logRetryAttempted(boolean logRetryAttempted) {
+ public LegacyDefaultErrorHandlerBuilder logRetryAttempted(boolean logRetryAttempted) {
getRedeliveryPolicy().setLogRetryAttempted(logRetryAttempted);
return this;
}
- public DefaultErrorHandlerBuilder logExhaustedMessageHistory(boolean logExhaustedMessageHistory) {
+ public LegacyDefaultErrorHandlerBuilder logExhaustedMessageHistory(boolean logExhaustedMessageHistory) {
getRedeliveryPolicy().setLogExhaustedMessageHistory(logExhaustedMessageHistory);
return this;
}
- public DefaultErrorHandlerBuilder logExhaustedMessageBody(boolean logExhaustedMessageBody) {
+ public LegacyDefaultErrorHandlerBuilder logExhaustedMessageBody(boolean logExhaustedMessageBody) {
getRedeliveryPolicy().setLogExhaustedMessageBody(logExhaustedMessageBody);
return this;
}
- public DefaultErrorHandlerBuilder exchangeFormatterRef(String exchangeFormatterRef) {
+ public LegacyDefaultErrorHandlerBuilder exchangeFormatterRef(String exchangeFormatterRef) {
getRedeliveryPolicy().setExchangeFormatterRef(exchangeFormatterRef);
return this;
}
@@ -195,7 +196,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @see RedeliveryPolicy#setAsyncDelayedRedelivery(boolean)
* @return the builder
*/
- public DefaultErrorHandlerBuilder asyncDelayedRedelivery() {
+ public LegacyDefaultErrorHandlerBuilder asyncDelayedRedelivery() {
getRedeliveryPolicy().setAsyncDelayedRedelivery(true);
return this;
}
@@ -206,7 +207,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @param allowRedeliveryWhileStopping <tt>true</tt> to allow redelivery, <tt>false</tt> to reject redeliveries
* @return the builder
*/
- public DefaultErrorHandlerBuilder allowRedeliveryWhileStopping(boolean allowRedeliveryWhileStopping) {
+ public LegacyDefaultErrorHandlerBuilder allowRedeliveryWhileStopping(boolean allowRedeliveryWhileStopping) {
getRedeliveryPolicy().setAllowRedeliveryWhileStopping(allowRedeliveryWhileStopping);
return this;
}
@@ -217,7 +218,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @param executorService the scheduled thread pool to use
* @return the builder.
*/
- public DefaultErrorHandlerBuilder executorService(ScheduledExecutorService executorService) {
+ public LegacyDefaultErrorHandlerBuilder executorService(ScheduledExecutorService executorService) {
setExecutorService(executorService);
return this;
}
@@ -228,7 +229,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @param ref reference to a scheduled thread pool
* @return the builder.
*/
- public DefaultErrorHandlerBuilder executorServiceRef(String ref) {
+ public LegacyDefaultErrorHandlerBuilder executorServiceRef(String ref) {
setExecutorServiceRef(ref);
return this;
}
@@ -239,7 +240,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @param logger the logger
* @return the builder
*/
- public DefaultErrorHandlerBuilder logger(CamelLogger logger) {
+ public LegacyDefaultErrorHandlerBuilder logger(CamelLogger logger) {
setLogger(logger);
return this;
}
@@ -250,7 +251,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @param level the logging level
* @return the builder
*/
- public DefaultErrorHandlerBuilder loggingLevel(LoggingLevel level) {
+ public LegacyDefaultErrorHandlerBuilder loggingLevel(LoggingLevel level) {
getLogger().setLevel(level);
return this;
}
@@ -261,7 +262,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @param log the logger
* @return the builder
*/
- public DefaultErrorHandlerBuilder log(org.slf4j.Logger log) {
+ public LegacyDefaultErrorHandlerBuilder log(org.slf4j.Logger log) {
getLogger().setLog(log);
return this;
}
@@ -272,7 +273,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @param log the log name
* @return the builder
*/
- public DefaultErrorHandlerBuilder log(String log) {
+ public LegacyDefaultErrorHandlerBuilder log(String log) {
return log(LoggerFactory.getLogger(log));
}
@@ -282,7 +283,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @param log the log class
* @return the builder
*/
- public DefaultErrorHandlerBuilder log(Class<?> log) {
+ public LegacyDefaultErrorHandlerBuilder log(Class<?> log) {
return log(LoggerFactory.getLogger(log));
}
@@ -294,7 +295,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @param processor the processor
* @return the builder
*/
- public DefaultErrorHandlerBuilder onRedelivery(Processor processor) {
+ public LegacyDefaultErrorHandlerBuilder onRedelivery(Processor processor) {
setOnRedelivery(processor);
return this;
}
@@ -306,7 +307,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @return the builder
* @see #onRedelivery(Processor)
*/
- public DefaultErrorHandlerBuilder onRedeliveryRef(String onRedeliveryRef) {
+ public LegacyDefaultErrorHandlerBuilder onRedeliveryRef(String onRedeliveryRef) {
setOnRedeliveryRef(onRedeliveryRef);
return this;
}
@@ -319,12 +320,12 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @param retryWhile expression that determines when to stop retrying
* @return the builder
*/
- public DefaultErrorHandlerBuilder retryWhile(Expression retryWhile) {
+ public LegacyDefaultErrorHandlerBuilder retryWhile(Expression retryWhile) {
setRetryWhile(ExpressionToPredicateAdapter.toPredicate(retryWhile));
return this;
}
- public DefaultErrorHandlerBuilder retryWhileRef(String retryWhileRef) {
+ public LegacyDefaultErrorHandlerBuilder retryWhileRef(String retryWhileRef) {
setRetryWhileRef(retryWhileRef);
return this;
}
@@ -361,7 +362,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @return the builder
* @see #useOriginalBody()
*/
- public DefaultErrorHandlerBuilder useOriginalMessage() {
+ public LegacyDefaultErrorHandlerBuilder useOriginalMessage() {
setUseOriginalMessage(true);
return this;
}
@@ -398,7 +399,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @return the builder
* @see #useOriginalMessage()
*/
- public DefaultErrorHandlerBuilder useOriginalBody() {
+ public LegacyDefaultErrorHandlerBuilder useOriginalBody() {
setUseOriginalBody(true);
return this;
}
@@ -418,20 +419,20 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* exception on the {@link org.apache.camel.Exchange}
* @return the builder
*/
- public DefaultErrorHandlerBuilder deadLetterHandleNewException(boolean handleNewException) {
+ public LegacyDefaultErrorHandlerBuilder deadLetterHandleNewException(boolean handleNewException) {
setDeadLetterHandleNewException(handleNewException);
return this;
}
/**
- * Sets a custom {@link org.apache.camel.Processor} to prepare the {@link org.apache.camel.Exchange} before handled
- * by the failure processor / dead letter channel. This allows for example to enrich the message before sending to a
- * dead letter queue.
+ * Sets a custom {@link Processor} to prepare the {@link org.apache.camel.Exchange} before handled by the failure
+ * processor / dead letter channel. This allows for example to enrich the message before sending to a dead letter
+ * queue.
*
* @param processor the processor
* @return the builder
*/
- public DefaultErrorHandlerBuilder onPrepareFailure(Processor processor) {
+ public LegacyDefaultErrorHandlerBuilder onPrepareFailure(Processor processor) {
setOnPrepareFailure(processor);
return this;
}
@@ -443,21 +444,21 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @return the builder
* @see #onPrepareFailure(Processor)
*/
- public DefaultErrorHandlerBuilder onPrepareFailureRef(String onPrepareFailureRef) {
+ public LegacyDefaultErrorHandlerBuilder onPrepareFailureRef(String onPrepareFailureRef) {
setOnPrepareFailureRef(onPrepareFailureRef);
return this;
}
/**
- * Sets a custom {@link org.apache.camel.Processor} to process the {@link org.apache.camel.Exchange} just after an
- * exception was thrown. This allows to execute the processor at the same time the exception was thrown.
+ * Sets a custom {@link Processor} to process the {@link org.apache.camel.Exchange} just after an exception was
+ * thrown. This allows to execute the processor at the same time the exception was thrown.
* <p/>
* Important: Any exception thrown from this processor will be ignored.
*
* @param processor the processor
* @return the builder
*/
- public DefaultErrorHandlerBuilder onExceptionOccurred(Processor processor) {
+ public LegacyDefaultErrorHandlerBuilder onExceptionOccurred(Processor processor) {
setOnExceptionOccurred(processor);
return this;
}
@@ -469,7 +470,7 @@ public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport imple
* @return the builder
* @see #onExceptionOccurred(Processor)
*/
- public DefaultErrorHandlerBuilder onExceptionOccurredRef(String onExceptionOccurredRef) {
+ public LegacyDefaultErrorHandlerBuilder onExceptionOccurredRef(String onExceptionOccurredRef) {
setOnExceptionOccurredRef(onExceptionOccurredRef);
return this;
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyErrorHandlerBuilder.java
similarity index 85%
rename from core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyErrorHandlerBuilder.java
index ee846e34b65..7effbde849d 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyErrorHandlerBuilder.java
@@ -19,9 +19,9 @@ package org.apache.camel.builder;
import org.apache.camel.ErrorHandlerFactory;
/**
- * A builder of a <a href="http://camel.apache.org/error-handler.html">Error Handler</a>
+ * Legacy error handler for XML DSL in camel-spring-xml/camel-blueprint
*/
@Deprecated
-public interface ErrorHandlerBuilder extends ErrorHandlerFactory {
+public interface LegacyErrorHandlerBuilder extends ErrorHandlerFactory {
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyErrorHandlerBuilderRef.java
similarity index 82%
copy from core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
copy to core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyErrorHandlerBuilderRef.java
index 5ee318f8d7e..444f15118d4 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyErrorHandlerBuilderRef.java
@@ -23,16 +23,16 @@ import org.apache.camel.model.errorhandler.ErrorHandlerRefProperties;
* Legacy error handler for XML DSL in camel-spring-xml/camel-blueprint
*/
@Deprecated
-public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport implements ErrorHandlerRefProperties {
+public class LegacyErrorHandlerBuilderRef extends LegacyErrorHandlerBuilderSupport implements ErrorHandlerRefProperties {
public static final String DEFAULT_ERROR_HANDLER_BUILDER = ErrorHandlerRefProperties.DEFAULT_ERROR_HANDLER_BUILDER;
private final ErrorHandlerRefConfiguration configuration = new ErrorHandlerRefConfiguration();
- public ErrorHandlerBuilderRef() {
+ public LegacyErrorHandlerBuilderRef() {
}
- public ErrorHandlerBuilderRef(String ref) {
+ public LegacyErrorHandlerBuilderRef(String ref) {
this.configuration.setRef(ref);
}
@@ -42,13 +42,13 @@ public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport implement
}
@Override
- public ErrorHandlerBuilder cloneBuilder() {
- ErrorHandlerBuilderRef answer = new ErrorHandlerBuilderRef(configuration.getRef());
+ public LegacyErrorHandlerBuilder cloneBuilder() {
+ LegacyErrorHandlerBuilderRef answer = new LegacyErrorHandlerBuilderRef(configuration.getRef());
cloneBuilder(answer);
return answer;
}
- protected void cloneBuilder(ErrorHandlerBuilderRef other) {
+ protected void cloneBuilder(LegacyErrorHandlerBuilderRef other) {
other.setSupportTransacted(configuration.isSupportTransacted());
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyErrorHandlerBuilderSupport.java
similarity index 85%
rename from core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
rename to core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyErrorHandlerBuilderSupport.java
index 95bf74fa101..0e9d61d22b9 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyErrorHandlerBuilderSupport.java
@@ -17,10 +17,10 @@
package org.apache.camel.builder;
/**
- * Base class for builders of error handling.
+ * Legacy error handler for XML DSL in camel-spring-xml/camel-blueprint
*/
@Deprecated
-public abstract class ErrorHandlerBuilderSupport implements ErrorHandlerBuilder {
+public abstract class LegacyErrorHandlerBuilderSupport implements LegacyErrorHandlerBuilder {
@Override
public boolean supportTransacted() {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyNoErrorHandlerBuilder.java
similarity index 83%
copy from core/camel-core-model/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
copy to core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyNoErrorHandlerBuilder.java
index 6a8574466a3..1813a98ebd8 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/LegacyNoErrorHandlerBuilder.java
@@ -22,7 +22,7 @@ import org.apache.camel.model.errorhandler.NoErrorHandlerProperties;
* Legacy error handler for XML DSL in camel-spring-xml/camel-blueprint
*/
@Deprecated
-public class NoErrorHandlerBuilder extends ErrorHandlerBuilderSupport implements NoErrorHandlerProperties {
+public class LegacyNoErrorHandlerBuilder extends LegacyErrorHandlerBuilderSupport implements NoErrorHandlerProperties {
@Override
public boolean supportTransacted() {
@@ -30,7 +30,7 @@ public class NoErrorHandlerBuilder extends ErrorHandlerBuilderSupport implements
}
@Override
- public ErrorHandlerBuilder cloneBuilder() {
- return new NoErrorHandlerBuilder();
+ public LegacyErrorHandlerBuilder cloneBuilder() {
+ return new LegacyNoErrorHandlerBuilder();
}
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
index 6a8574466a3..34f22cdf1f1 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
@@ -22,7 +22,7 @@ import org.apache.camel.model.errorhandler.NoErrorHandlerProperties;
* Legacy error handler for XML DSL in camel-spring-xml/camel-blueprint
*/
@Deprecated
-public class NoErrorHandlerBuilder extends ErrorHandlerBuilderSupport implements NoErrorHandlerProperties {
+public class NoErrorHandlerBuilder extends LegacyErrorHandlerBuilderSupport implements NoErrorHandlerProperties {
@Override
public boolean supportTransacted() {
@@ -30,7 +30,7 @@ public class NoErrorHandlerBuilder extends ErrorHandlerBuilderSupport implements
}
@Override
- public ErrorHandlerBuilder cloneBuilder() {
+ public LegacyErrorHandlerBuilder cloneBuilder() {
return new NoErrorHandlerBuilder();
}
}
[camel] 02/02: CAMEL-16834: error handler in model DSL. WIP
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch errorhandler-in-dsl
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b2384e6158142654cd0af1ea7c865d8f19f1e17c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 7 18:50:06 2022 +0200
CAMEL-16834: error handler in model DSL. WIP
---
.../resources/org/apache/camel/component/avro/avro-http-producer.xml | 4 ++--
.../resources/org/apache/camel/component/avro/avro-netty-producer.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/resources/org/apache/camel/component/avro/avro-http-producer.xml b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/resources/org/apache/camel/component/avro/avro-http-producer.xml
index 467f13bacbc..f8b93855491 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/resources/org/apache/camel/component/avro/avro-http-producer.xml
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/resources/org/apache/camel/component/avro/avro-http-producer.xml
@@ -23,11 +23,11 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <bean id="inOnlyErrorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="inOnlyErrorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:in-message-name-error"/>
</bean>
- <bean id="inOutErrorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="inOutErrorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:inout-message-name-error"/>
</bean>
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/resources/org/apache/camel/component/avro/avro-netty-producer.xml b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/resources/org/apache/camel/component/avro/avro-netty-producer.xml
index 187e1be98ae..125ea0a8ff4 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/resources/org/apache/camel/component/avro/avro-netty-producer.xml
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/resources/org/apache/camel/component/avro/avro-netty-producer.xml
@@ -23,11 +23,11 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
- <bean id="inOnlyErrorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="inOnlyErrorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:in-message-name-error"/>
</bean>
- <bean id="inOutErrorHandler" class="org.apache.camel.builder.DeadLetterChannelBuilder">
+ <bean id="inOutErrorHandler" class="org.apache.camel.builder.LegacyDeadLetterChannelBuilder">
<property name="deadLetterUri" value="mock:inout-message-name-error"/>
</bean>