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 19:03:40 UTC
[camel-karaf] branch errorhandler-in-dsl created (now f79738d7)
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-karaf.git
at f79738d7 CAMEL-16834: error handler in model DSL. WIP
This branch includes the following new commits:
new f79738d7 CAMEL-16834: error handler in model DSL. WIP
The 1 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.
[camel-karaf] 01/01: 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-karaf.git
commit f79738d79a64525b51db018253fde49d14fcc7b7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 7 21:03:24 2022 +0200
CAMEL-16834: error handler in model DSL. WIP
---
.../camel/blueprint/CamelErrorHandlerFactoryBean.java | 16 ++++++++--------
.../org/apache/camel/blueprint/ErrorHandlerType.java | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
index fd6e7ded..60d459ee 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
@@ -27,8 +27,8 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.CamelContext;
import org.apache.camel.Processor;
-import org.apache.camel.builder.DefaultErrorHandlerBuilder;
-import org.apache.camel.builder.ErrorHandlerBuilder;
+import org.apache.camel.builder.LegacyDefaultErrorHandlerBuilder;
+import org.apache.camel.builder.LegacyErrorHandlerBuilder;
import org.apache.camel.core.xml.AbstractCamelFactoryBean;
import org.apache.camel.model.RedeliveryPolicyDefinition;
import org.apache.camel.processor.errorhandler.RedeliveryPolicy;
@@ -37,7 +37,7 @@ import org.osgi.service.blueprint.container.BlueprintContainer;
@XmlRootElement(name = "errorHandler")
@XmlAccessorType(XmlAccessType.FIELD)
-public class CamelErrorHandlerFactoryBean extends AbstractCamelFactoryBean<ErrorHandlerBuilder> {
+public class CamelErrorHandlerFactoryBean extends AbstractCamelFactoryBean<LegacyErrorHandlerBuilder> {
@XmlAttribute
private ErrorHandlerType type = ErrorHandlerType.DefaultErrorHandler;
@@ -67,10 +67,10 @@ public class CamelErrorHandlerFactoryBean extends AbstractCamelFactoryBean<Error
private BlueprintContainer blueprintContainer;
@Override
- public ErrorHandlerBuilder getObject() throws Exception {
- ErrorHandlerBuilder errorHandler = getObjectType().newInstance();
- if (errorHandler instanceof DefaultErrorHandlerBuilder) {
- DefaultErrorHandlerBuilder handler = (DefaultErrorHandlerBuilder) errorHandler;
+ public LegacyErrorHandlerBuilder getObject() throws Exception {
+ LegacyErrorHandlerBuilder errorHandler = getObjectType().newInstance();
+ if (errorHandler instanceof LegacyDefaultErrorHandlerBuilder) {
+ LegacyDefaultErrorHandlerBuilder handler = (LegacyDefaultErrorHandlerBuilder) errorHandler;
if (deadLetterUri != null) {
handler.setDeadLetterUri(deadLetterUri);
}
@@ -109,7 +109,7 @@ public class CamelErrorHandlerFactoryBean extends AbstractCamelFactoryBean<Error
}
@Override
- public Class<? extends ErrorHandlerBuilder> getObjectType() {
+ public Class<? extends LegacyErrorHandlerBuilder> getObjectType() {
return type.getTypeAsClass();
}
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java
index 72a0d6f2..380b1b4c 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java
@@ -19,10 +19,10 @@ package org.apache.camel.blueprint;
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.ErrorHandlerBuilder;
-import org.apache.camel.builder.NoErrorHandlerBuilder;
+import org.apache.camel.builder.LegacyDeadLetterChannelBuilder;
+import org.apache.camel.builder.LegacyDefaultErrorHandlerBuilder;
+import org.apache.camel.builder.LegacyErrorHandlerBuilder;
+import org.apache.camel.builder.LegacyNoErrorHandlerBuilder;
/**
* Used to configure the errorHandler type
@@ -38,14 +38,14 @@ public enum ErrorHandlerType {
*
* @return the class which represents the selected type.
*/
- public Class<? extends ErrorHandlerBuilder> getTypeAsClass() {
+ public Class<? extends LegacyErrorHandlerBuilder> 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;
default:
throw new IllegalArgumentException("Unknown error handler: " + this);
}