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 01daada6ef58c6caa4e7847510c52e87ef4a62c2 Author: Claus Ibsen <[email protected]> AuthorDate: Thu Apr 7 20:11:21 2022 +0200 CAMEL-16834: error handler in model DSL. WIP --- components/camel-cdi-jta/pom.xml | 1 + .../camel-cdi-jta/src/generated/resources/cdi-jta.json | 2 +- components/camel-cdi-jta/src/main/docs/cdi-jta.adoc | 2 +- .../main/java/org/apache/camel/cdi/CdiRouteBuilder.java | 16 ---------------- .../camel/component/cxf/jaxrs/CxfRsConsumerTest.java | 4 ++-- .../component/cxf/jaxrs/CxfRsSpringConsumerTest.java | 4 ++-- .../tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java | 4 ++-- ...ransactionErrorHandlerRedeliveryDelayTest-context.xml | 2 +- .../component/jms/tx/JMSTransactionErrorHandlerTest.xml | 2 +- .../component/jms/tx/JMSTransactionalClientTest.xml | 2 +- .../jms/tx/JMSTransactionalClientWithRollbackTest.xml | 2 +- .../TransactionErrorHandlerBuilderAsSpringBeanTest.xml | 2 +- .../java/org/apache/camel/itest/TransactionSupport.java | 8 ++++---- 13 files changed, 18 insertions(+), 33 deletions(-) diff --git a/components/camel-cdi-jta/pom.xml b/components/camel-cdi-jta/pom.xml index f3cec03bf1d..1b7170a8398 100644 --- a/components/camel-cdi-jta/pom.xml +++ b/components/camel-cdi-jta/pom.xml @@ -36,6 +36,7 @@ <firstVersion>3.15.0</firstVersion> <label>java</label> <title>CDI JTA</title> + <supportLevel>Experimental</supportLevel> </properties> <dependencies> diff --git a/components/camel-cdi-jta/src/generated/resources/cdi-jta.json b/components/camel-cdi-jta/src/generated/resources/cdi-jta.json index c3a841c75a6..8df4f2c17e9 100644 --- a/components/camel-cdi-jta/src/generated/resources/cdi-jta.json +++ b/components/camel-cdi-jta/src/generated/resources/cdi-jta.json @@ -7,7 +7,7 @@ "deprecated": false, "firstVersion": "3.15.0", "label": "java", - "supportLevel": "Stable", + "supportLevel": "Experimental", "groupId": "org.apache.camel", "artifactId": "camel-cdi-jta", "version": "3.17.0-SNAPSHOT" diff --git a/components/camel-cdi-jta/src/main/docs/cdi-jta.adoc b/components/camel-cdi-jta/src/main/docs/cdi-jta.adoc index 956b43d8795..f600785d96a 100644 --- a/components/camel-cdi-jta/src/main/docs/cdi-jta.adoc +++ b/components/camel-cdi-jta/src/main/docs/cdi-jta.adoc @@ -4,7 +4,7 @@ :artifactid: camel-cdi-jta :description: JTA Transaction support for Camel CDI :since: 3.15 -:supportlevel: Stable +:supportlevel: Experimental *Since Camel {since}* diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java index a695b0d8287..e3c49c32605 100644 --- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java +++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java @@ -16,9 +16,7 @@ */ package org.apache.camel.cdi; -import org.apache.camel.builder.DefaultErrorHandlerBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.cdi.transaction.CdiTransactionalErrorHandlerBuilder; /** * An extension of the {@link RouteBuilder} to provide some additional JTA helper methods. @@ -28,18 +26,4 @@ import org.apache.camel.cdi.transaction.CdiTransactionalErrorHandlerBuilder; */ public abstract class CdiRouteBuilder extends RouteBuilder { - /** - * Creates a transaction error handler that will lookup in application context for an exiting transaction manager. - * - * @return the created error handler - */ - // IMPORTANT: don't leak CdiJtaTransactionErrorHandlerBuilder in the signature, - // only things not depending on camel-jta - public <T extends DefaultErrorHandlerBuilder & CdiTransactionalErrorHandlerBuilder> T transactionErrorHandler() { - try { - return (T) new org.apache.camel.cdi.transaction.CdiJtaTransactionErrorHandlerBuilder(); - } catch (final NoClassDefFoundError e) { - throw new IllegalStateException("JTA not available"); - } - } } diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java index 45312b0cc38..8ef339584d4 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java @@ -37,7 +37,7 @@ import org.apache.camel.LoggingLevel; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.builder.NoErrorHandlerBuilder; +import org.apache.camel.builder.LegacyNoErrorHandlerBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; @@ -91,7 +91,7 @@ public class CxfRsConsumerTest extends CamelTestSupport { final Processor testProcessor3 = new TestProcessor3(); return new RouteBuilder() { public void configure() { - errorHandler(new NoErrorHandlerBuilder()); + errorHandler(new LegacyNoErrorHandlerBuilder()); from(CXF_RS_ENDPOINT_URI).process(testProcessor); from(CXF_RS_ENDPOINT_URI2).process(testProcessor); from(CXF_RS_ENDPOINT_URI3).process(testProcessor); diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringConsumerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringConsumerTest.java index 14a87098340..671caa1d5f0 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringConsumerTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringConsumerTest.java @@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.builder.NoErrorHandlerBuilder; +import org.apache.camel.builder.LegacyNoErrorHandlerBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.CXFTestSupport; import org.apache.camel.component.cxf.jaxrs.testbean.CustomException; @@ -55,7 +55,7 @@ public class CxfRsSpringConsumerTest extends CamelSpringTestSupport { }; return new RouteBuilder() { public void configure() { - errorHandler(new NoErrorHandlerBuilder()); + errorHandler(new LegacyNoErrorHandlerBuilder()); from("cxfrs://bean://rsServer").process(testProcessor); from("cxfrs://bean://rsServer2").process(testProcessor); from("cxfrs://bean://rsServerInvoke?performInvocation=true").process(responseProcessor); diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java index b57f95d4a76..7862558fc6d 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMXTXUseOriginalBodyWithTXErrorHandlerTest.java @@ -23,7 +23,7 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.spring.spi.TransactionErrorHandlerBuilder; +import org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -91,7 +91,7 @@ public class JMXTXUseOriginalBodyWithTXErrorHandlerTest extends JMXTXUseOriginal @Override public void configure() { - errorHandler(new TransactionErrorHandlerBuilder()); + errorHandler(new LegacyTransactionErrorHandlerBuilder()); onException(Exception.class) .handled(true) diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml index 9328946cd0b..6f200341048 100644 --- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml +++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest-context.xml @@ -35,7 +35,7 @@ <bean id="myFailureProcessor" class="org.apache.camel.component.jms.issues.TransactionErrorHandlerRedeliveryDelayTest$MyFailureProcessor"/> - <bean id="myTransactionErrorHandler" class="org.apache.camel.spring.spi.TransactionErrorHandlerBuilder"> + <bean id="myTransactionErrorHandler" class="org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder"> <property name="transactionTemplate" ref="PROPAGATION_REQUIRED"/> </bean> diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml index b3e13d1de7f..1fbc765667d 100644 --- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml +++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.xml @@ -56,7 +56,7 @@ <!-- START SNIPPET: e3 --> <!-- use a transaction error handler --> - <bean id="myErrorHandler" class="org.apache.camel.spring.spi.TransactionErrorHandlerBuilder"> + <bean id="myErrorHandler" class="org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder"> <property name="redeliveryPolicy" ref="myPolicy"/> </bean> <!-- and let it try to redeliver up till 4 times --> diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml index 6e77f1f332b..1d87f3d9954 100644 --- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml +++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.xml @@ -46,7 +46,7 @@ <!-- START SNIPPET: e2 --> <!-- the transactional error handler --> - <bean id="errorHandler" class="org.apache.camel.spring.spi.TransactionErrorHandlerBuilder"> + <bean id="errorHandler" class="org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder"> <property name="springTransactionPolicy" ref="PROPAGATION_REQUIRED"/> </bean> diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml index 336d64e4f2f..11fc9f97111 100644 --- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml +++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.xml @@ -55,7 +55,7 @@ <!-- START SNIPPET: e2 --> <!-- the transactional error handler --> - <bean id="errorHandler" class="org.apache.camel.spring.spi.TransactionErrorHandlerBuilder"> + <bean id="errorHandler" class="org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder"> <property name="springTransactionPolicy" ref="PROPAGATION_REQUIRED"/> </bean> diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml index 038bf43fdb4..cfecb8c9f20 100644 --- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml +++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.xml @@ -66,7 +66,7 @@ </bean> <!-- the transaction error handle we refer to from the route --> - <bean id="transactionErrorHandler" class="org.apache.camel.spring.spi.TransactionErrorHandlerBuilder"> + <bean id="transactionErrorHandler" class="org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder"> <property name="transactionTemplate" ref="PROPAGATION_REQUIRED"/> </bean> diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/TransactionSupport.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/TransactionSupport.java index 506d60c2b6b..0ed9c8c878b 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/TransactionSupport.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/TransactionSupport.java @@ -17,8 +17,8 @@ package org.apache.camel.itest; +import org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder; import org.apache.camel.spring.spi.SpringTransactionPolicy; -import org.apache.camel.spring.spi.TransactionErrorHandlerBuilder; import org.springframework.transaction.support.TransactionTemplate; public final class TransactionSupport { @@ -31,7 +31,7 @@ public final class TransactionSupport { * @param policy using this transaction policy (eg: required, supports, ...) * @return the created error handler */ - public static TransactionErrorHandlerBuilder transactionErrorHandler(SpringTransactionPolicy policy) { + public static LegacyTransactionErrorHandlerBuilder transactionErrorHandler(SpringTransactionPolicy policy) { return transactionErrorHandler(policy.getTransactionTemplate()); } @@ -41,8 +41,8 @@ public final class TransactionSupport { * @param template the spring transaction template * @return the created error handler */ - private static TransactionErrorHandlerBuilder transactionErrorHandler(TransactionTemplate template) { - TransactionErrorHandlerBuilder answer = new TransactionErrorHandlerBuilder(); + private static LegacyTransactionErrorHandlerBuilder transactionErrorHandler(TransactionTemplate template) { + LegacyTransactionErrorHandlerBuilder answer = new LegacyTransactionErrorHandlerBuilder(); answer.setTransactionTemplate(template); return answer; }
