This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit ead057d61c040d90dff407d144d7d1b429376967 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Apr 11 06:51:29 2022 +0200 CAMEL-16834: error handler in DSL model --- .../main/java/org/apache/camel/jta/JtaTransactionErrorHandler.java | 6 +++++- .../org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandler.java b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandler.java index 68c8d66f4ee..1d6c48cb414 100644 --- a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandler.java +++ b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionErrorHandler.java @@ -24,6 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.LoggingLevel; import org.apache.camel.Predicate; import org.apache.camel.Processor; +import org.apache.camel.builder.JtaTransactionErrorHandlerBuilder; import org.apache.camel.model.errorhandler.JtaTransactionErrorHandlerDefinition; import org.apache.camel.processor.errorhandler.RedeliveryErrorHandler; import org.apache.camel.processor.errorhandler.RedeliveryPolicy; @@ -41,7 +42,10 @@ import org.slf4j.LoggerFactory; public class JtaTransactionErrorHandler extends RedeliveryErrorHandler { static { - // register camel-jta as transaction error handler + // register camel-jta as transaction error handler (both builder and definition) + ErrorHandlerReifier.registerReifier(JtaTransactionErrorHandlerBuilder.class, + (route, errorHandlerFactory) -> new JtaTransactionErrorHandlerReifier( + route, (JtaTransactionErrorHandlerDefinition) errorHandlerFactory)); ErrorHandlerReifier.registerReifier(JtaTransactionErrorHandlerDefinition.class, (route, errorHandlerFactory) -> new JtaTransactionErrorHandlerReifier( route, (JtaTransactionErrorHandlerDefinition) errorHandlerFactory)); diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java index 2539d4301e6..70937602c9f 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerReifier.java @@ -24,6 +24,7 @@ import org.apache.camel.LoggingLevel; import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.Route; +import org.apache.camel.builder.SpringTransactionErrorHandlerBuilder; import org.apache.camel.model.RedeliveryPolicyDefinition; import org.apache.camel.model.errorhandler.SpringTransactionErrorHandlerDefinition; import org.apache.camel.model.errorhandler.TransactionErrorHandlerDefinition; @@ -44,7 +45,10 @@ import static org.apache.camel.model.TransactedDefinition.PROPAGATION_REQUIRED; public class TransactionErrorHandlerReifier extends ErrorHandlerReifier<SpringTransactionErrorHandlerDefinition> { static { - // register camel-spring as transaction error handler + // register camel-spring as transaction error handler (both builder and definition) + ErrorHandlerReifier.registerReifier(SpringTransactionErrorHandlerBuilder.class, + (route, errorHandlerFactory) -> new TransactionErrorHandlerReifier( + route, (SpringTransactionErrorHandlerDefinition) errorHandlerFactory)); ErrorHandlerReifier.registerReifier(SpringTransactionErrorHandlerDefinition.class, (route, errorHandlerFactory) -> new TransactionErrorHandlerReifier( route, (SpringTransactionErrorHandlerDefinition) errorHandlerFactory));
