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
The following commit(s) were added to refs/heads/errorhandler-in-dsl by this
push:
new 3c352bb6e66 CAMEL-16834: error handler in model DSL. WIP
3c352bb6e66 is described below
commit 3c352bb6e6629f2f6b3690abfa965dd34ec96b86
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Apr 7 20:54:00 2022 +0200
CAMEL-16834: error handler in model DSL. WIP
---
.../org/apache/camel/builder/BuilderSupport.java | 16 ++++------
.../camel/builder/DeadLetterChannelBuilder.java | 37 ++++++++++++++++++++++
.../camel/builder/DefaultErrorHandlerBuilder.java | 25 +++++++++++++++
.../builder/JtaTransactionErrorHandlerBuilder.java | 37 ++++++++++++++++++++++
.../camel/builder/NoErrorHandlerBuilder.java | 25 +++++++++++++++
.../camel/builder/RefErrorHandlerBuilder.java | 32 +++++++++++++++++++
.../SpringTransactionErrorHandlerBuilder.java | 37 ++++++++++++++++++++++
.../reifier/errorhandler/ErrorHandlerReifier.java | 12 -------
.../camel/builder/ContextErrorHandlerTest.java | 3 +-
.../ErrorHandlerRefPropertyPlaceholderTest.java | 3 +-
.../apache/camel/builder/ErrorHandlerRefTest.java | 3 +-
...tScopedOnExceptionErrorHandlerRefIssueTest.java | 4 +--
...ExceptionErrorHandlerRefIssueTwoRoutesTest.java | 4 +--
...ScopedOnExceptionMultipleRouteBuildersTest.java | 4 +--
...xceptionNotHandledErrorHandlerRefIssueTest.java | 4 +--
...otHandledErrorHandlerRefIssueTwoRoutesTest.java | 4 +--
...HandledRouteScopedErrorHandlerRefIssueTest.java | 4 +--
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 4 +--
...ceptionRouteScopedErrorHandlerRefIssueTest.java | 4 +--
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 4 +--
.../issues/OnExceptionContinuedIssueTest.java | 4 +--
.../OnExceptionErrorHandlerRefIssueTest.java | 4 +--
...ExceptionErrorHandlerRefIssueTwoRoutesTest.java | 4 +--
...xceptionNotHandledErrorHandlerRefIssueTest.java | 4 +--
...otHandledErrorHandlerRefIssueTwoRoutesTest.java | 4 +--
...HandledRouteScopedErrorHandlerRefIssueTest.java | 4 +--
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 4 +--
...ceptionRouteScopedErrorHandlerRefIssueTest.java | 4 +--
...uteScopedErrorHandlerRefIssueTwoRoutesTest.java | 4 +--
...ScopedOnExceptionMultipleRouteBuildersTest.java | 4 +--
.../errorhandler/NewDeadLetterChannelTest.java | 4 +--
31 files changed, 243 insertions(+), 67 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
index f60e83a5937..36e8c83cd9d 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
@@ -27,10 +27,8 @@ import org.apache.camel.ErrorHandlerFactory;
import org.apache.camel.Expression;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.model.errorhandler.DefaultErrorHandlerDefinition;
import
org.apache.camel.model.errorhandler.JtaTransactionErrorHandlerDefinition;
-import org.apache.camel.model.errorhandler.NoErrorHandlerDefinition;
import
org.apache.camel.model.errorhandler.SpringTransactionErrorHandlerDefinition;
import org.apache.camel.model.language.DatasonnetExpression;
import org.apache.camel.model.language.ExchangePropertyExpression;
@@ -423,8 +421,8 @@ public abstract class BuilderSupport implements
CamelContextAware {
*
* @return the builder
*/
- public DefaultErrorHandlerDefinition defaultErrorHandler() {
- return new DefaultErrorHandlerDefinition();
+ public DefaultErrorHandlerBuilder defaultErrorHandler() {
+ return new DefaultErrorHandlerBuilder();
}
/**
@@ -433,8 +431,8 @@ public abstract class BuilderSupport implements
CamelContextAware {
*
* @return the builder
*/
- public NoErrorHandlerDefinition noErrorHandler() {
- return new NoErrorHandlerDefinition();
+ public NoErrorHandlerBuilder noErrorHandler() {
+ return new NoErrorHandlerBuilder();
}
/**
@@ -444,8 +442,8 @@ public abstract class BuilderSupport implements
CamelContextAware {
* @param deadLetterUri uri to the dead letter endpoint storing dead
messages
* @return the builder
*/
- public DeadLetterChannelDefinition deadLetterChannel(String deadLetterUri)
{
- DeadLetterChannelDefinition answer = new DeadLetterChannelDefinition();
+ public DeadLetterChannelBuilder deadLetterChannel(String deadLetterUri) {
+ DeadLetterChannelBuilder answer = new DeadLetterChannelBuilder();
answer.setDeadLetterUri(deadLetterUri);
return answer;
}
@@ -457,7 +455,7 @@ public abstract class BuilderSupport implements
CamelContextAware {
* @param deadLetterEndpoint dead letter endpoint storing dead messages
* @return the builder
*/
- public DeadLetterChannelDefinition deadLetterChannel(Endpoint
deadLetterEndpoint) {
+ public DeadLetterChannelBuilder deadLetterChannel(Endpoint
deadLetterEndpoint) {
return deadLetterChannel(deadLetterEndpoint.getEndpointUri());
}
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
new file mode 100644
index 00000000000..25ba3cdef48
--- /dev/null
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
+
+/**
+ * Dead letter channel error handler as a builder.
+ */
+public class DeadLetterChannelBuilder extends DeadLetterChannelDefinition {
+
+ public DeadLetterChannelBuilder() {
+ }
+
+ public DeadLetterChannelBuilder(String deadLetterUri) {
+ super(deadLetterUri);
+ }
+
+ public DeadLetterChannelBuilder(Endpoint deadLetterUri) {
+ super(deadLetterUri);
+ }
+}
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
new file mode 100644
index 00000000000..14e41839238
--- /dev/null
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder;
+
+import org.apache.camel.model.errorhandler.DefaultErrorHandlerDefinition;
+
+/**
+ * Default error handler as a builder.
+ */
+public class DefaultErrorHandlerBuilder extends DefaultErrorHandlerDefinition {
+}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/JtaTransactionErrorHandlerBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/JtaTransactionErrorHandlerBuilder.java
new file mode 100644
index 00000000000..e3e19e93ee1
--- /dev/null
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/JtaTransactionErrorHandlerBuilder.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder;
+
+import
org.apache.camel.model.errorhandler.JtaTransactionErrorHandlerDefinition;
+
+/**
+ * JTA transaction error handler as a builder.
+ */
+public class JtaTransactionErrorHandlerBuilder extends
JtaTransactionErrorHandlerDefinition {
+
+ public JtaTransactionErrorHandlerBuilder() {
+ }
+
+ public JtaTransactionErrorHandlerBuilder(Object transactedPolicy) {
+ if (transactedPolicy instanceof String) {
+ setTransactedPolicyRef((String) transactedPolicy);
+ } else {
+ setTransactedPolicy(transactedPolicy);
+ }
+ }
+
+}
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
new file mode 100644
index 00000000000..4b90cb8c5be
--- /dev/null
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder;
+
+import org.apache.camel.model.errorhandler.NoErrorHandlerDefinition;
+
+/**
+ * No error handler as a builder.
+ */
+public class NoErrorHandlerBuilder extends NoErrorHandlerDefinition {
+}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RefErrorHandlerBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RefErrorHandlerBuilder.java
new file mode 100644
index 00000000000..3dff0b56746
--- /dev/null
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RefErrorHandlerBuilder.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder;
+
+import org.apache.camel.model.errorhandler.ErrorHandlerRefDefinition;
+
+/**
+ * Ref error handler as a builder.
+ */
+public class RefErrorHandlerBuilder extends ErrorHandlerRefDefinition {
+
+ public RefErrorHandlerBuilder() {
+ }
+
+ public RefErrorHandlerBuilder(String ref) {
+ super(ref);
+ }
+}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/SpringTransactionErrorHandlerBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/SpringTransactionErrorHandlerBuilder.java
new file mode 100644
index 00000000000..e595edcb49c
--- /dev/null
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/SpringTransactionErrorHandlerBuilder.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder;
+
+import
org.apache.camel.model.errorhandler.SpringTransactionErrorHandlerDefinition;
+
+/**
+ * Spring transaction error handler as a builder.
+ */
+public class SpringTransactionErrorHandlerBuilder extends
SpringTransactionErrorHandlerDefinition {
+
+ public SpringTransactionErrorHandlerBuilder() {
+ }
+
+ public SpringTransactionErrorHandlerBuilder(Object transactedPolicy) {
+ if (transactedPolicy instanceof String) {
+ setTransactedPolicyRef((String) transactedPolicy);
+ } else {
+ setTransactedPolicy(transactedPolicy);
+ }
+ }
+
+}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
index cdb840566b3..639ca1587bf 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
@@ -91,18 +91,6 @@ public abstract class ErrorHandlerReifier<T extends
ErrorHandlerFactory> extends
}
private static ErrorHandlerReifier<? extends ErrorHandlerFactory>
coreReifier(Route route, ErrorHandlerFactory definition) {
- // TODO: old which should be removed when new are working
- // if (definition instanceof DeadLetterChannelProperties) {
- // return new DeadLetterChannelReifier(route, definition);
- // } else if (definition instanceof
DefaultErrorHandlerProperties) {
- // return new DefaultErrorHandlerReifier<>(route,
definition);
- // } else if (definition instanceof ErrorHandlerRefProperties) {
- // if (definition instanceof ErrorHandlerRefProperties) {
- // return new ErrorHandlerRefReifier(route, definition);
- // } else if (definition instanceof NoErrorHandlerProperties) {
- // return new NoErrorHandlerReifier(route, definition);
- // }
-
if (definition instanceof DeadLetterChannelDefinition) {
return new DeadLetterChannelReifier(route,
(DeadLetterChannelDefinition) definition);
} else if (definition instanceof DefaultErrorHandlerDefinition) {
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 1826dbac415..88fa1abf00a 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
@@ -26,7 +26,6 @@ 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;
@@ -45,7 +44,7 @@ public class ContextErrorHandlerTest extends
ContextTestSupport {
RedeliveryPolicyDefinition redeliveryPolicy = new
RedeliveryPolicyDefinition();
redeliveryPolicy.maximumRedeliveries(1);
redeliveryPolicy.setUseExponentialBackOff("true");
- DeadLetterChannelDefinition deadLetterChannelBuilder = new
DeadLetterChannelDefinition("mock:error");
+ DeadLetterChannelBuilder deadLetterChannelBuilder = new
DeadLetterChannelBuilder("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 05bdf0c797c..be7869504a7 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,7 +20,6 @@ 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
{
@@ -44,7 +43,7 @@ public class ErrorHandlerRefPropertyPlaceholderTest extends
ContextTestSupport {
prop.put("myErrorHandler", "myDead");
context.getPropertiesComponent().setOverrideProperties(prop);
- DeadLetterChannelDefinition dlc = new
DeadLetterChannelDefinition("mock:dead");
+ DeadLetterChannelBuilder dlc = new
DeadLetterChannelBuilder("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 794a87a389c..96e7c5f5eca 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,7 +18,6 @@ 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 {
@@ -38,7 +37,7 @@ public class ErrorHandlerRefTest extends ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- DeadLetterChannelDefinition dlc = new
DeadLetterChannelDefinition("mock:dead");
+ DeadLetterChannelBuilder dlc = new
DeadLetterChannelBuilder("mock:dead");
context.getRegistry().bind("myDead", dlc);
errorHandler("myDead");
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 1ffc66a9e0d..78ccae3e3d2 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,8 +17,8 @@
package org.apache.camel.issues;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.DeadLetterChannelBuilder;
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;
@@ -41,7 +41,7 @@ public class ContextScopedOnExceptionErrorHandlerRefIssueTest
extends ContextTes
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead"));
return jndi;
}
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 996bc550acd..0925ea4062a 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,8 +19,8 @@ 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.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.model.errorhandler.ErrorHandlerRefDefinition;
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 DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("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 ad9feeff02e..e43421cace6 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
DeadLetterChannelDefinition("mock:dead"));
+ context.adapt(ExtendedCamelContext.class).setErrorHandlerFactory(new
DeadLetterChannelBuilder("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 e20e4bc25ef..9ca6d5318a9 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,8 +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.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.spi.Registry;
import org.junit.jupiter.api.Test;
@@ -51,7 +51,7 @@ public class
ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTest extends
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead"));
return jndi;
}
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 fdb015b0185..0e1150a656d 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,8 +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.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.spi.Registry;
import org.junit.jupiter.api.Test;
@@ -64,7 +64,7 @@ public class
ContextScopedOnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead"));
return jndi;
}
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 9e676538152..686cb590c45 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,8 +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.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.model.errorhandler.ErrorHandlerRefDefinition;
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 DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("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 785de559012..516954788c6 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,8 +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.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.spi.Registry;
import org.junit.jupiter.api.Test;
@@ -64,7 +64,7 @@ public class
ContextScopedOnExceptionNotHandledRouteScopedErrorHandlerRefIssueTw
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("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 402085981b9..0c8766ce1eb 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,8 +17,8 @@
package org.apache.camel.issues;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.DeadLetterChannelBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.model.errorhandler.ErrorHandlerRefDefinition;
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 DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("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 18db4f2877d..ac75f8733c5 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,8 +19,8 @@ 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.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.spi.Registry;
import org.junit.jupiter.api.Test;
@@ -54,7 +54,7 @@ public class
ContextScopedOnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTes
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("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 522137928f0..ec73d8f5700 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,8 +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.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.junit.jupiter.api.Test;
public class OnExceptionContinuedIssueTest extends ContextTestSupport {
@@ -33,7 +33,7 @@ public class OnExceptionContinuedIssueTest extends
ContextTestSupport {
@Test
public void testOnExceptionWrappedMatch() throws Exception {
- final DeadLetterChannelDefinition defaultErrorHandlerBuilder = new
DeadLetterChannelDefinition("direct:dead");
+ final DeadLetterChannelBuilder defaultErrorHandlerBuilder = new
DeadLetterChannelBuilder("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 b8257c02d6d..599ccc3bc6f 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,8 +17,8 @@
package org.apache.camel.issues;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.DeadLetterChannelBuilder;
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;
@@ -41,7 +41,7 @@ public class OnExceptionErrorHandlerRefIssueTest extends
ContextTestSupport {
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead"));
return jndi;
}
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 075e60baeb7..15e978efeaf 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,8 +17,8 @@
package org.apache.camel.issues;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.DeadLetterChannelBuilder;
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 OnExceptionErrorHandlerRefIssueTwoRoutesTest
extends ContextTestSup
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead"));
return jndi;
}
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 c8cbc6fbf1b..f125a60f762 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,8 +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.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.spi.Registry;
import org.junit.jupiter.api.Test;
@@ -51,7 +51,7 @@ public class OnExceptionNotHandledErrorHandlerRefIssueTest
extends ContextTestSu
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead"));
return jndi;
}
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 7349aa94b54..73af082df6b 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,8 +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.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.spi.Registry;
import org.junit.jupiter.api.Test;
@@ -62,7 +62,7 @@ public class
OnExceptionNotHandledErrorHandlerRefIssueTwoRoutesTest extends Cont
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("mock:dead"));
return jndi;
}
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 9c70b6bc518..969c670f983 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,8 +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.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.spi.Registry;
import org.junit.jupiter.api.Test;
@@ -51,7 +51,7 @@ public class
OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTest extends Co
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("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 9c5451e6466..1476f58e4b9 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,8 +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.RouteBuilder;
-import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
import org.apache.camel.spi.Registry;
import org.junit.jupiter.api.Test;
@@ -62,7 +62,7 @@ public class
OnExceptionNotHandledRouteScopedErrorHandlerRefIssueTwoRoutesTest e
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("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 a3930f70062..507f954142d 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,8 +17,8 @@
package org.apache.camel.issues;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.DeadLetterChannelBuilder;
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;
@@ -41,7 +41,7 @@ public class OnExceptionRouteScopedErrorHandlerRefIssueTest
extends ContextTestS
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("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 a5ca4b19655..7764d10dd04 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,8 +17,8 @@
package org.apache.camel.issues;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.DeadLetterChannelBuilder;
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
OnExceptionRouteScopedErrorHandlerRefIssueTwoRoutesTest extends Con
@Override
protected Registry createRegistry() throws Exception {
Registry jndi = super.createRegistry();
- jndi.bind("myDLC", new DeadLetterChannelDefinition("mock:dead"));
+ jndi.bind("myDLC", new DeadLetterChannelBuilder("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 8c94f7a14fc..a7a3e8a497f 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
DeadLetterChannelDefinition("mock:dead"));
+ context.adapt(ExtendedCamelContext.class).setErrorHandlerFactory(new
DeadLetterChannelBuilder("mock:dead"));
return context;
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/NewDeadLetterChannelTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/NewDeadLetterChannelTest.java
index 6c65af6aa6f..92dabeaae81 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/NewDeadLetterChannelTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/NewDeadLetterChannelTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.processor.errorhandler;
import org.apache.camel.ContextTestSupport;
+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;
@Deprecated
@@ -38,7 +38,7 @@ public class NewDeadLetterChannelTest extends
ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- DeadLetterChannelDefinition dlc = new
DeadLetterChannelDefinition();
+ DeadLetterChannelBuilder dlc = new DeadLetterChannelBuilder();
dlc.setDeadLetterUri("mock:dead");
errorHandler(dlc);
