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 223382ea7ffecc547c7951a78eb3738217bf421f Author: Claus Ibsen <[email protected]> AuthorDate: Wed Apr 6 09:17:29 2022 +0200 CAMEL-16834: error handler in model DSL. WIP --- .../java/org/apache/camel/builder/ErrorHandlerBuilderRef.java | 1 + .../main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java | 1 + .../src/main/java/org/apache/camel/builder/RouteBuilder.java | 1 + .../java/org/apache/camel/builder/ContextErrorHandlerTest.java | 8 +++++--- .../camel/builder/ErrorHandlerRefPropertyPlaceholderTest.java | 3 ++- .../test/java/org/apache/camel/builder/ErrorHandlerRefTest.java | 3 ++- .../org/apache/camel/builder/RouteTemplateErrorHandlerTest.java | 3 ++- .../issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java | 7 +++---- ...ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java | 4 ++-- .../issues/ContextScopedOnExceptionMultipleRouteBuildersTest.java | 4 ++-- ...ontextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java | 7 +++---- ...pedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java | 7 +++---- ...dOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java | 4 ++-- ...ionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java | 4 ++-- ...ntextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java | 4 ++-- ...edOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java | 4 ++-- .../org/apache/camel/issues/OnExceptionContinuedIssueTest.java | 5 ++--- .../apache/camel/issues/OnExceptionErrorHandlerRefIssueTest.java | 7 +++---- .../issues/OnExceptionErrorHandlerRefIssueTwoRoutesTest.java | 7 +++---- .../issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java | 7 +++---- .../OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java | 7 +++---- .../OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java | 4 ++-- ...ionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java | 4 ++-- .../issues/OnExceptionRouteScopedErrorHandlerRefIssueTest.java | 4 ++-- .../OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java | 4 ++-- .../issues/RouteScopedOnExceptionMultipleRouteBuildersTest.java | 4 ++-- 26 files changed, 59 insertions(+), 59 deletions(-) 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 88b069b4eb9..6808adce971 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 @@ -22,6 +22,7 @@ import org.apache.camel.model.errorhandler.ErrorHandlerRefProperties; /** * Represents a proxy to an error handler builder which is resolved by named reference */ +@Deprecated public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport implements ErrorHandlerRefProperties { public static final String DEFAULT_ERROR_HANDLER_BUILDER = ErrorHandlerRefProperties.DEFAULT_ERROR_HANDLER_BUILDER; 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 f1ee2930635..62b333f6cf8 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 @@ -25,6 +25,7 @@ import org.apache.camel.model.errorhandler.NoErrorHandlerProperties; * unsure; however it can be useful sometimes to disable an error handler inside a complex route so that exceptions * bubble up to the parent {@link Processor} */ +@Deprecated public class NoErrorHandlerBuilder extends ErrorHandlerBuilderSupport implements NoErrorHandlerProperties { @Override diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java index d661d533285..f20e21886be 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java @@ -368,6 +368,7 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild * * @param ref reference to the error handler to use */ + @Deprecated public void errorHandler(String ref) { if (!getRouteCollection().getRoutes().isEmpty()) { throw new IllegalArgumentException("errorHandler must be defined before any routes in the RouteBuilder"); diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java index 54715126718..1826dbac415 100644 --- a/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java @@ -25,6 +25,8 @@ import org.apache.camel.ExtendedCamelContext; import org.apache.camel.Processor; import org.apache.camel.Route; import org.apache.camel.impl.engine.DefaultRoute; +import org.apache.camel.model.RedeliveryPolicyDefinition; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.processor.SendProcessor; import org.apache.camel.processor.errorhandler.DeadLetterChannel; import org.apache.camel.processor.errorhandler.RedeliveryPolicy; @@ -40,10 +42,10 @@ public class ContextErrorHandlerTest extends ContextTestSupport { public void setUp() throws Exception { setUseRouteBuilder(false); super.setUp(); - RedeliveryPolicy redeliveryPolicy = new RedeliveryPolicy(); + RedeliveryPolicyDefinition redeliveryPolicy = new RedeliveryPolicyDefinition(); redeliveryPolicy.maximumRedeliveries(1); - redeliveryPolicy.setUseExponentialBackOff(true); - DeadLetterChannelBuilder deadLetterChannelBuilder = new DeadLetterChannelBuilder("mock:error"); + redeliveryPolicy.setUseExponentialBackOff("true"); + DeadLetterChannelDefinition deadLetterChannelBuilder = new DeadLetterChannelDefinition("mock:error"); deadLetterChannelBuilder.setRedeliveryPolicy(redeliveryPolicy); context.adapt(ExtendedCamelContext.class).setErrorHandlerFactory(deadLetterChannelBuilder); } diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerRefPropertyPlaceholderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerRefPropertyPlaceholderTest.java index be7869504a7..05bdf0c797c 100644 --- a/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerRefPropertyPlaceholderTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerRefPropertyPlaceholderTest.java @@ -20,6 +20,7 @@ import java.util.Properties; import org.apache.camel.ContextTestSupport; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.junit.jupiter.api.Test; public class ErrorHandlerRefPropertyPlaceholderTest extends ContextTestSupport { @@ -43,7 +44,7 @@ public class ErrorHandlerRefPropertyPlaceholderTest extends ContextTestSupport { prop.put("myErrorHandler", "myDead"); context.getPropertiesComponent().setOverrideProperties(prop); - DeadLetterChannelBuilder dlc = new DeadLetterChannelBuilder("mock:dead"); + DeadLetterChannelDefinition dlc = new DeadLetterChannelDefinition("mock:dead"); context.getRegistry().bind("myDead", dlc); errorHandler("{{myErrorHandler}}"); diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerRefTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerRefTest.java index 96e7c5f5eca..794a87a389c 100644 --- a/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerRefTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerRefTest.java @@ -18,6 +18,7 @@ package org.apache.camel.builder; import org.apache.camel.ContextTestSupport; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.junit.jupiter.api.Test; public class ErrorHandlerRefTest extends ContextTestSupport { @@ -37,7 +38,7 @@ public class ErrorHandlerRefTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - DeadLetterChannelBuilder dlc = new DeadLetterChannelBuilder("mock:dead"); + DeadLetterChannelDefinition dlc = new DeadLetterChannelDefinition("mock:dead"); context.getRegistry().bind("myDead", dlc); errorHandler("myDead"); diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateErrorHandlerTest.java index 33c5d53d531..907dcea1e84 100644 --- a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateErrorHandlerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateErrorHandlerTest.java @@ -19,6 +19,7 @@ package org.apache.camel.builder; import org.apache.camel.Channel; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.engine.DefaultRoute; +import org.apache.camel.model.errorhandler.NoErrorHandlerDefinition; import org.apache.camel.processor.errorhandler.NoErrorHandler; import org.junit.jupiter.api.Test; @@ -30,7 +31,7 @@ public class RouteTemplateErrorHandlerTest { @Test public void testDefineRouteTemplate() throws Exception { try (DefaultCamelContext context = new DefaultCamelContext()) { - context.getRegistry().bind("myErrorHandler", new NoErrorHandlerBuilder()); + context.getRegistry().bind("myErrorHandler", new NoErrorHandlerDefinition()); context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java index a1aa39f764c..1ffc66a9e0d 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTest.java @@ -17,9 +17,8 @@ package org.apache.camel.issues; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; -import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -42,7 +41,7 @@ public class ContextScopedOnExceptionErrorHandlerRefIssueTest extends ContextTes @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } @@ -51,7 +50,7 @@ public class ContextScopedOnExceptionErrorHandlerRefIssueTest extends ContextTes return new RouteBuilder() { @Override public void configure() throws Exception { - errorHandler(new ErrorHandlerBuilderRef("myDLC")); + errorHandler("myDLC"); onException(IllegalArgumentException.class).handled(true).to("mock:handled").end(); diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java index cb831e996ed..3e191840b6a 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest.java @@ -19,9 +19,9 @@ package org.apache.camel.issues; import java.io.IOException; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -55,7 +55,7 @@ public class ContextScopedOnExceptionErrorHandlerRefIssueTwoRoutesTest extends C @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionMultipleRouteBuildersTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionMultipleRouteBuildersTest.java index e43421cace6..ad9feeff02e 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionMultipleRouteBuildersTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionMultipleRouteBuildersTest.java @@ -19,8 +19,8 @@ package org.apache.camel.issues; import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.junit.jupiter.api.Test; public class ContextScopedOnExceptionMultipleRouteBuildersTest extends ContextTestSupport { @@ -52,7 +52,7 @@ public class ContextScopedOnExceptionMultipleRouteBuildersTest extends ContextTe @Override protected CamelContext createCamelContext() throws Exception { CamelContext context = super.createCamelContext(); - context.adapt(ExtendedCamelContext.class).setErrorHandlerFactory(new DeadLetterChannelBuilder("mock:dead")); + context.adapt(ExtendedCamelContext.class).setErrorHandlerFactory(new DeadLetterChannelDefinition("mock:dead")); return context; } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java index f1d1029381c..e20e4bc25ef 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest.java @@ -18,9 +18,8 @@ package org.apache.camel.issues; import org.apache.camel.CamelExecutionException; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; -import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -52,7 +51,7 @@ public class ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest extends @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } @@ -63,7 +62,7 @@ public class ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest extends public void configure() throws Exception { onException(IllegalArgumentException.class).handled(false).to("mock:handled").end(); - errorHandler(new ErrorHandlerBuilderRef("myDLC")); + errorHandler("myDLC"); from("direct:start").to("mock:a").throwException(new IllegalArgumentException("Damn")); } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java index 76fc4100c2d..fdb015b0185 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java @@ -20,9 +20,8 @@ import java.io.IOException; import org.apache.camel.CamelExecutionException; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; -import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -65,7 +64,7 @@ public class ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } @@ -74,7 +73,7 @@ public class ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest return new RouteBuilder() { @Override public void configure() throws Exception { - errorHandler(new ErrorHandlerBuilderRef("myDLC")); + errorHandler("myDLC"); onException(IllegalArgumentException.class).handled(false).to("mock:handled").end(); diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java index d5552c6b35d..aa0c069c931 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java @@ -18,9 +18,9 @@ package org.apache.camel.issues; import org.apache.camel.CamelExecutionException; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -52,7 +52,7 @@ public class ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTe @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java index 98ff479573c..a24466012cb 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java @@ -20,9 +20,9 @@ import java.io.IOException; import org.apache.camel.CamelExecutionException; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -65,7 +65,7 @@ public class ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTw @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java index 9a74d3a07d1..fd6fcd87b8f 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest.java @@ -17,9 +17,9 @@ package org.apache.camel.issues; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -42,7 +42,7 @@ public class ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTest extends @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java index 99676a12bdc..853a5102af6 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java @@ -19,9 +19,9 @@ package org.apache.camel.issues; import java.io.IOException; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -55,7 +55,7 @@ public class ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTes @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionContinuedIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionContinuedIssueTest.java index 3754e75f152..522137928f0 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionContinuedIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionContinuedIssueTest.java @@ -20,9 +20,8 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.ExtendedCamelContext; import org.apache.camel.Processor; -import org.apache.camel.builder.DeadLetterChannelBuilder; -import org.apache.camel.builder.DefaultErrorHandlerBuilder; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.junit.jupiter.api.Test; public class OnExceptionContinuedIssueTest extends ContextTestSupport { @@ -34,7 +33,7 @@ public class OnExceptionContinuedIssueTest extends ContextTestSupport { @Test public void testOnExceptionWrappedMatch() throws Exception { - final DefaultErrorHandlerBuilder defaultErrorHandlerBuilder = new DeadLetterChannelBuilder("direct:dead"); + final DeadLetterChannelDefinition defaultErrorHandlerBuilder = new DeadLetterChannelDefinition("direct:dead"); defaultErrorHandlerBuilder.redeliveryDelay(0); // run fast defaultErrorHandlerBuilder.maximumRedeliveries(2); diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTest.java index 312f41a2823..b8257c02d6d 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTest.java @@ -17,9 +17,8 @@ package org.apache.camel.issues; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; -import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -42,7 +41,7 @@ public class OnExceptionErrorHandlerRefIssueTest extends ContextTestSupport { @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } @@ -51,7 +50,7 @@ public class OnExceptionErrorHandlerRefIssueTest extends ContextTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - errorHandler(new ErrorHandlerBuilderRef("myDLC")); + errorHandler("myDLC"); from("direct:start").onException(IllegalArgumentException.class).handled(true).to("mock:handled").end() .to("mock:a") diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTwoRoutesTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTwoRoutesTest.java index 53f0d6d07fe..075e60baeb7 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTwoRoutesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionErrorHandlerRefIssueTwoRoutesTest.java @@ -17,9 +17,8 @@ package org.apache.camel.issues; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; -import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -53,7 +52,7 @@ public class OnExceptionErrorHandlerRefIssueTwoRoutesTest extends ContextTestSup @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } @@ -62,7 +61,7 @@ public class OnExceptionErrorHandlerRefIssueTwoRoutesTest extends ContextTestSup return new RouteBuilder() { @Override public void configure() throws Exception { - errorHandler(new ErrorHandlerBuilderRef("myDLC")); + errorHandler("myDLC"); from("direct:foo").to("mock:foo").throwException(new IllegalArgumentException("Damn Foo")); diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java index a26e7b0d8ef..c8cbc6fbf1b 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTest.java @@ -18,9 +18,8 @@ package org.apache.camel.issues; import org.apache.camel.CamelExecutionException; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; -import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -52,7 +51,7 @@ public class OnExceptionNotHandledErrorHandlerRefIssueTest extends ContextTestSu @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } @@ -61,7 +60,7 @@ public class OnExceptionNotHandledErrorHandlerRefIssueTest extends ContextTestSu return new RouteBuilder() { @Override public void configure() throws Exception { - errorHandler(new ErrorHandlerBuilderRef("myDLC")); + errorHandler("myDLC"); from("direct:start").onException(IllegalArgumentException.class).handled(false).to("mock:handled").end() .to("mock:a") diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java index 3b8087cfa04..7349aa94b54 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest.java @@ -18,9 +18,8 @@ package org.apache.camel.issues; import org.apache.camel.CamelExecutionException; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; -import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -63,7 +62,7 @@ public class OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest extends Cont @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } @@ -72,7 +71,7 @@ public class OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest extends Cont return new RouteBuilder() { @Override public void configure() throws Exception { - errorHandler(new ErrorHandlerBuilderRef("myDLC")); + errorHandler("myDLC"); from("direct:foo").to("mock:foo").throwException(new IllegalArgumentException("Damn Foo")); diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java index 36de67ed835..c262e0c2429 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest.java @@ -18,9 +18,9 @@ package org.apache.camel.issues; import org.apache.camel.CamelExecutionException; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -52,7 +52,7 @@ public class OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest extends Co @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java index 32411495be3..838ddabd639 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest.java @@ -18,9 +18,9 @@ package org.apache.camel.issues; import org.apache.camel.CamelExecutionException; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -63,7 +63,7 @@ public class OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest e @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTest.java index 4eaf557345e..d8b28186360 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTest.java @@ -17,9 +17,9 @@ package org.apache.camel.issues; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -42,7 +42,7 @@ public class OnExceptionRouteScopedErrorHandlerRefIssueTest extends ContextTestS @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java index 827b1dfa336..5c126dd1296 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest.java @@ -17,9 +17,9 @@ package org.apache.camel.issues; import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.ErrorHandlerBuilderRef; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; @@ -53,7 +53,7 @@ public class OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest extends Con @Override protected Registry createRegistry() throws Exception { Registry jndi = super.createRegistry(); - jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead")); + jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead")); return jndi; } diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionMultipleRouteBuildersTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionMultipleRouteBuildersTest.java index a7a3e8a497f..8c94f7a14fc 100644 --- a/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionMultipleRouteBuildersTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/issues/RouteScopedOnExceptionMultipleRouteBuildersTest.java @@ -19,9 +19,9 @@ package org.apache.camel.issues; import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.builder.DeadLetterChannelBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition; import org.junit.jupiter.api.Test; public class RouteScopedOnExceptionMultipleRouteBuildersTest extends ContextTestSupport { @@ -53,7 +53,7 @@ public class RouteScopedOnExceptionMultipleRouteBuildersTest extends ContextTest @Override protected CamelContext createCamelContext() throws Exception { CamelContext context = new DefaultCamelContext(createRegistry()); - context.adapt(ExtendedCamelContext.class).setErrorHandlerFactory(new DeadLetterChannelBuilder("mock:dead")); + context.adapt(ExtendedCamelContext.class).setErrorHandlerFactory(new DeadLetterChannelDefinition("mock:dead")); return context; }
