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 b2c3e4610553488451352ecde806f4d10eff3c27 Author: Claus Ibsen <[email protected]> AuthorDate: Wed Apr 6 07:27:02 2022 +0200 CAMEL-16834: error handler in model DSL. WIP --- .../apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java | 1 + .../apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java | 1 + .../org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java | 1 + .../org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java | 4 ++-- .../camel/reifier/errorhandler/NewDeadLetterChannelReifier.java | 2 ++ .../camel/reifier/errorhandler/NewDefaultErrorHandlerReifier.java | 2 ++ .../apache/camel/reifier/errorhandler/NewNoErrorHandlerReifier.java | 2 ++ .../org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java | 1 + 8 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java index 7fb4f12bd2a..9212ab9bc90 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java @@ -28,6 +28,7 @@ import org.apache.camel.processor.errorhandler.RedeliveryPolicy; import org.apache.camel.spi.CamelLogger; import org.apache.camel.util.ObjectHelper; +@Deprecated public class DeadLetterChannelReifier extends DefaultErrorHandlerReifier<DeadLetterChannelProperties> { public DeadLetterChannelReifier(Route route, ErrorHandlerFactory definition) { diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java index 445b69ab887..400919a16a7 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java @@ -28,6 +28,7 @@ import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.ExecutorServiceManager; import org.apache.camel.spi.ThreadPoolProfile; +@Deprecated public class DefaultErrorHandlerReifier<T extends DefaultErrorHandlerProperties> extends ErrorHandlerReifier<T> { public DefaultErrorHandlerReifier(Route route, ErrorHandlerFactory definition) { diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java index 186773c63f0..e5fadb1b85e 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java @@ -24,6 +24,7 @@ import org.apache.camel.model.errorhandler.ErrorHandlerHelper; import org.apache.camel.model.errorhandler.ErrorHandlerRefProperties; import org.apache.camel.util.ObjectHelper; +@Deprecated public class ErrorHandlerRefReifier extends ErrorHandlerReifier<ErrorHandlerRefProperties> { public ErrorHandlerRefReifier(Route route, ErrorHandlerFactory definition) { 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 e48f144ab9c..a29395d0e18 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 @@ -94,7 +94,7 @@ public abstract class ErrorHandlerReifier<T extends ErrorHandlerFactory> extends } private static ErrorHandlerReifier<? extends ErrorHandlerFactory> coreReifier(Route route, ErrorHandlerFactory definition) { - // TODO: legacy, should + // TODO: old which should be removed when new are working if (definition instanceof DeadLetterChannelProperties) { return new DeadLetterChannelReifier(route, definition); } else if (definition instanceof DefaultErrorHandlerProperties) { @@ -112,7 +112,7 @@ public abstract class ErrorHandlerReifier<T extends ErrorHandlerFactory> extends } else if (definition instanceof NoErrorHandlerDefinition) { return new NewNoErrorHandlerReifier(route, definition); } - // TODO: ref properties? + // TODO: ref properties? used by spring // } else if (definition instanceof ErrorHandlerRefProperties) { // return new ErrorHandlerRefReifier(route, definition); diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDeadLetterChannelReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDeadLetterChannelReifier.java index f1b4f5875ab..bb40161b46b 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDeadLetterChannelReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDeadLetterChannelReifier.java @@ -37,6 +37,8 @@ import org.apache.camel.util.ObjectHelper; public class NewDeadLetterChannelReifier extends ErrorHandlerReifier<DeadLetterChannelDefinition> { + // TODO: Rename when working + public NewDeadLetterChannelReifier(Route route, DeadLetterChannelDefinition definition) { super(route, definition); } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDefaultErrorHandlerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDefaultErrorHandlerReifier.java index cbdb97c1862..265c2262c71 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDefaultErrorHandlerReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDefaultErrorHandlerReifier.java @@ -37,6 +37,8 @@ import org.apache.camel.spi.ThreadPoolProfile; public class NewDefaultErrorHandlerReifier extends ErrorHandlerReifier<DefaultErrorHandlerDefinition> { + // TODO: Rename when working + public NewDefaultErrorHandlerReifier(Route route, DefaultErrorHandlerDefinition definition) { super(route, definition); } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewNoErrorHandlerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewNoErrorHandlerReifier.java index d75640ecb87..94f89371c8e 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewNoErrorHandlerReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewNoErrorHandlerReifier.java @@ -25,6 +25,8 @@ import org.apache.camel.spi.ErrorHandler; public class NewNoErrorHandlerReifier extends ErrorHandlerReifier<NoErrorHandlerDefinition> { + // TODO: Rename when working + public NewNoErrorHandlerReifier(Route route, ErrorHandlerFactory definition) { super(route, (NoErrorHandlerDefinition) definition); } diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java index 35d1ac5ae22..9d15013322a 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java @@ -23,6 +23,7 @@ import org.apache.camel.model.errorhandler.NoErrorHandlerProperties; import org.apache.camel.processor.errorhandler.NoErrorHandler; import org.apache.camel.spi.ErrorHandler; +@Deprecated public class NoErrorHandlerReifier extends ErrorHandlerReifier<NoErrorHandlerProperties> { public NoErrorHandlerReifier(Route route, ErrorHandlerFactory definition) {
