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/11 05:04:05 UTC
[camel] branch main updated (a3fce33dce9 -> 392acab4796)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from a3fce33dce9 CAMEL-17879: remove beanio dataformat since camel-beanio was removed
new ead057d61c0 CAMEL-16834: error handler in DSL model
new 8f675ac8566 Polished
new 392acab4796 CAMEL-16834: error handler in DSL model
The 3 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.
Summary of changes:
.../apache/camel/jta/JtaTransactionErrorHandler.java | 9 ---------
.../java/org/apache/camel/jta/JtaTransactionPolicy.java | 12 ++++++++++++
.../camel/spring/spi/SpringTransactionPolicy.java | 17 ++++++++++++++++-
.../spring/spi/TransactionErrorHandlerReifier.java | 7 -------
tests/camel-itest/pom.xml | 7 ++++++-
5 files changed, 34 insertions(+), 18 deletions(-)
[camel] 01/03: CAMEL-16834: error handler in DSL model
Posted by da...@apache.org.
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 <cl...@gmail.com>
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));
[camel] 02/03: Polished
Posted by da...@apache.org.
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 8f675ac8566569da5ae65633998873289f3a103a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Apr 11 06:52:00 2022 +0200
Polished
---
tests/camel-itest/pom.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 7d7b97355ac..c218343a926 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -48,6 +48,11 @@
<artifactId>camel-jms</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jta</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
@@ -394,7 +399,7 @@
<!-- to validate Camel endpoints: mvn camel:validate -->
<plugin>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
+ <artifactId>camel-report-maven-plugin</artifactId>
<version>${project.version}</version>
<configuration>
<failOnError>false</failOnError>
[camel] 03/03: CAMEL-16834: error handler in DSL model
Posted by da...@apache.org.
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 392acab47965d481a9e36a2b1df4306ae290626f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Apr 11 07:03:47 2022 +0200
CAMEL-16834: error handler in DSL model
---
.../apache/camel/jta/JtaTransactionErrorHandler.java | 13 -------------
.../java/org/apache/camel/jta/JtaTransactionPolicy.java | 12 ++++++++++++
.../camel/spring/spi/SpringTransactionPolicy.java | 17 ++++++++++++++++-
.../spring/spi/TransactionErrorHandlerReifier.java | 11 -----------
4 files changed, 28 insertions(+), 25 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 1d6c48cb414..dd3542e8894 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,11 +24,8 @@ 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;
-import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
import org.apache.camel.spi.CamelLogger;
import org.apache.camel.spi.ErrorHandler;
import org.slf4j.Logger;
@@ -41,16 +38,6 @@ import org.slf4j.LoggerFactory;
*/
public class JtaTransactionErrorHandler extends RedeliveryErrorHandler {
- static {
- // 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));
- }
-
private static final Logger LOG = LoggerFactory.getLogger(JtaTransactionErrorHandler.class);
private final JtaTransactionPolicy transactionPolicy;
private final LoggingLevel rollbackLoggingLevel;
diff --git a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
index e8672e11531..855818b0f9b 100644
--- a/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
+++ b/components/camel-jta/src/main/java/org/apache/camel/jta/JtaTransactionPolicy.java
@@ -21,12 +21,14 @@ import org.apache.camel.NamedNode;
import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.builder.JtaTransactionErrorHandlerBuilder;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.errorhandler.ErrorHandlerHelper;
import org.apache.camel.model.errorhandler.ErrorHandlerRefDefinition;
import org.apache.camel.model.errorhandler.JtaTransactionErrorHandlerDefinition;
+import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
import org.apache.camel.spi.TransactedPolicy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,6 +41,16 @@ import org.slf4j.LoggerFactory;
*/
public abstract class JtaTransactionPolicy implements TransactedPolicy {
+ static {
+ // 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));
+ }
+
private static final Logger LOG = LoggerFactory.getLogger(JtaTransactionPolicy.class);
public interface Runnable {
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
index 3611d689b62..a0ba6d41273 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
@@ -21,10 +21,13 @@ import org.apache.camel.NamedNode;
import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.builder.SpringTransactionErrorHandlerBuilder;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.errorhandler.ErrorHandlerHelper;
import org.apache.camel.model.errorhandler.ErrorHandlerRefDefinition;
+import org.apache.camel.model.errorhandler.SpringTransactionErrorHandlerDefinition;
+import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
import org.apache.camel.spi.TransactedPolicy;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -36,12 +39,23 @@ import org.springframework.transaction.support.TransactionTemplate;
* Spring transaction policy when using spring based transactions.
*/
public class SpringTransactionPolicy implements TransactedPolicy {
+
private static final Logger LOG = LoggerFactory.getLogger(SpringTransactionPolicy.class);
private TransactionTemplate template;
private String name;
private String propagationBehaviorName;
private PlatformTransactionManager transactionManager;
+ static {
+ // 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));
+ }
+
/**
* Default constructor for easy spring configuration.
*/
@@ -99,8 +113,9 @@ public class SpringTransactionPolicy implements TransactedPolicy {
if (builder != null) {
LOG.debug("The ErrorHandlerBuilder configured is not a TransactionErrorHandlerBuilder: {}", builder);
} else {
- LOG.debug("No ErrorHandlerBuilder configured, will use default TransactionErrorHandlerBuilder settings");
+ LOG.debug("No ErrorHandlerBuilder configured, will use default LegacyTransactionErrorHandlerBuilder settings");
}
+ // use legacy transaction to also support camel-spring-xml
LegacyTransactionErrorHandlerBuilder txBuilder = new LegacyTransactionErrorHandlerBuilder();
txBuilder.setTransactionTemplate(getTransactionTemplate());
txBuilder.setSpringTransactionPolicy(this);
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 70937602c9f..46f51834bf8 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,7 +24,6 @@ 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,16 +43,6 @@ import static org.apache.camel.model.TransactedDefinition.PROPAGATION_REQUIRED;
public class TransactionErrorHandlerReifier extends ErrorHandlerReifier<SpringTransactionErrorHandlerDefinition> {
- static {
- // 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));
- }
-
private static final Logger LOG = LoggerFactory.getLogger(TransactionErrorHandlerReifier.class);
public TransactionErrorHandlerReifier(Route route, SpringTransactionErrorHandlerDefinition definition) {