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 1296cf7cab5 CAMEL-16834: error handler in model DSL. WIP
1296cf7cab5 is described below
commit 1296cf7cab58fc510eaaae7c54ba2a0cadb9691c
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Apr 6 10:26:00 2022 +0200
CAMEL-16834: error handler in model DSL. WIP
---
.../apache/camel/impl/DefaultModelReifierFactory.java | 4 ++--
.../java/org/apache/camel/builder/BuilderSupport.java | 2 +-
.../camel/builder/DefaultErrorHandlerBuilder.java | 1 +
.../camel/builder/ErrorHandlerBuilderSupport.java | 1 +
.../reifier/errorhandler/ErrorHandlerReifier.java | 18 ++++++++----------
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModelReifierFactory.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModelReifierFactory.java
index 76c52474658..182a18af242 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModelReifierFactory.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultModelReifierFactory.java
@@ -22,9 +22,9 @@ import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.builder.DefaultErrorHandlerBuilder;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.model.errorhandler.DefaultErrorHandlerDefinition;
import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.model.transformer.TransformerDefinition;
import org.apache.camel.model.validator.ValidatorDefinition;
@@ -67,7 +67,7 @@ public class DefaultModelReifierFactory implements
ModelReifierFactory {
@Override
public ErrorHandlerFactory createDefaultErrorHandler() {
- return new DefaultErrorHandlerBuilder();
+ return new DefaultErrorHandlerDefinition();
}
@Override
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 b21929a1e47..488786b9360 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
@@ -491,7 +491,7 @@ public abstract class BuilderSupport implements
CamelContextAware {
}
protected ErrorHandlerBuilder createErrorHandlerBuilder() {
- return new DefaultErrorHandlerBuilder();
+ return new DefaultErrorHandlerDefinition();
}
/**
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 abb32350dd0..4264f81593e 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
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
* The default error handler builder.
*/
@Configurer
+@Deprecated
public class DefaultErrorHandlerBuilder extends ErrorHandlerBuilderSupport
implements DefaultErrorHandlerProperties {
private final DefaultErrorHandlerConfiguration configuration;
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/ErrorHandlerBuilderSupport.java
index 07122de883e..95bf74fa101 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/ErrorHandlerBuilderSupport.java
@@ -19,6 +19,7 @@ package org.apache.camel.builder;
/**
* Base class for builders of error handling.
*/
+@Deprecated
public abstract class ErrorHandlerBuilderSupport implements
ErrorHandlerBuilder {
@Override
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 a29395d0e18..2aacae75f21 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
@@ -35,12 +35,9 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.model.RedeliveryPolicyDefinition;
import org.apache.camel.model.errorhandler.DeadLetterChannelDefinition;
-import org.apache.camel.model.errorhandler.DeadLetterChannelProperties;
import org.apache.camel.model.errorhandler.DefaultErrorHandlerDefinition;
-import org.apache.camel.model.errorhandler.DefaultErrorHandlerProperties;
import org.apache.camel.model.errorhandler.ErrorHandlerRefProperties;
import org.apache.camel.model.errorhandler.NoErrorHandlerDefinition;
-import org.apache.camel.model.errorhandler.NoErrorHandlerProperties;
import org.apache.camel.processor.errorhandler.ErrorHandlerSupport;
import org.apache.camel.processor.errorhandler.ExceptionPolicy;
import
org.apache.camel.processor.errorhandler.ExceptionPolicy.RedeliveryOption;
@@ -95,14 +92,15 @@ 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 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);
+ // } else if (definition instanceof
NoErrorHandlerProperties) {
+ // return new NoErrorHandlerReifier(route, definition);
}
if (definition instanceof DeadLetterChannelDefinition) {
