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/01/10 13:23:42 UTC
[camel] 02/04: CAMEL-15724: camel-cdi-jta - To decouple CDI from JTA
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 2ed79a58c431e77129bdc002844bb1475ae166cd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 10 14:17:39 2022 +0100
CAMEL-15724: camel-cdi-jta - To decouple CDI from JTA
---
catalog/camel-allcomponents/pom.xml | 4 ++
components/camel-cdi-jta/pom.xml | 66 ++++++++++++++++++++++
.../services/org/apache/camel/other.properties | 7 +++
.../src/generated/resources/cdi-jta.json | 15 +++++
.../camel-cdi-jta/src/main/docs/cdi-jta.adoc | 11 ++++
.../java/org/apache/camel/cdi/CdiRouteBuilder.java | 0
.../transaction/MandatoryJtaTransactionPolicy.java | 0
.../transaction/NestedJtaTransactionPolicy.java | 0
.../cdi/transaction/NeverJtaTransactionPolicy.java | 0
.../NotSupportedJtaTransactionPolicy.java | 0
.../transaction/RequiredJtaTransactionPolicy.java | 0
.../RequiresNewJtaTransactionPolicy.java | 0
.../transaction/SupportsJtaTransactionPolicy.java | 0
.../TransactionalJtaTransactionPolicy.java | 0
.../src/main/resources/META-INF/beans.xml | 28 +++++++++
components/camel-cdi/pom.xml | 12 ----
components/camel-cdi/src/main/docs/cdi.adoc | 4 +-
.../org/apache/camel/cdi/XmlCdiBeanFactory.java | 16 ++++--
.../camel/cdi/XmlErrorHandlerFactoryBean.java | 5 +-
.../org/apache/camel/cdi/xml/ErrorHandlerType.java | 14 ++---
parent/pom.xml | 5 ++
21 files changed, 159 insertions(+), 28 deletions(-)
diff --git a/catalog/camel-allcomponents/pom.xml b/catalog/camel-allcomponents/pom.xml
index 4428983..200b08a 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -287,6 +287,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-cdi-jta</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cdi-main</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-cdi-jta/pom.xml b/components/camel-cdi-jta/pom.xml
new file mode 100644
index 0000000..8dc3102
--- /dev/null
+++ b/components/camel-cdi-jta/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>3.15.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-cdi-jta</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Camel :: CDI JTA</name>
+ <description>JTA Transaction support for Camel CDI</description>
+
+ <properties>
+ <firstVersion>3.15.0</firstVersion>
+ <label>java</label>
+ <title>CDI JTA</title>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cdi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jta</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${cdi-api-2.0-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ <version>${jta-api-1.2-version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/components/camel-cdi-jta/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-cdi-jta/src/generated/resources/META-INF/services/org/apache/camel/other.properties
new file mode 100644
index 0000000..e39b7a6
--- /dev/null
+++ b/components/camel-cdi-jta/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -0,0 +1,7 @@
+# Generated by camel build tools - do NOT edit this file!
+name=cdi-jta
+groupId=org.apache.camel
+artifactId=camel-cdi-jta
+version=3.15.0-SNAPSHOT
+projectName=Camel :: CDI JTA
+projectDescription=JTA Transaction support for Camel CDI
diff --git a/components/camel-cdi-jta/src/generated/resources/cdi-jta.json b/components/camel-cdi-jta/src/generated/resources/cdi-jta.json
new file mode 100644
index 0000000..69f97b2
--- /dev/null
+++ b/components/camel-cdi-jta/src/generated/resources/cdi-jta.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "cdi-jta",
+ "title": "CDI JTA",
+ "description": "JTA Transaction support for Camel CDI",
+ "deprecated": false,
+ "firstVersion": "3.15.0",
+ "label": "java",
+ "supportLevel": "Preview",
+ "groupId": "org.apache.camel",
+ "artifactId": "camel-cdi-jta",
+ "version": "3.15.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
new file mode 100644
index 0000000..52fab1b
--- /dev/null
+++ b/components/camel-cdi-jta/src/main/docs/cdi-jta.adoc
@@ -0,0 +1,11 @@
+= CDI JTA Component
+:doctitle: CDI JTA
+:shortname: cdi-jta
+:artifactid: camel-cdi-jta
+:description: JTA Transaction support for Camel CDI
+:since: 3.15
+:supportlevel: Preview
+
+*Since Camel {since}*
+
+This module is JTA Transaction support for Camel CDI.
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java
similarity index 100%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java
rename to components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/CdiRouteBuilder.java
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
similarity index 100%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
rename to components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
similarity index 100%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
rename to components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
similarity index 100%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
rename to components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
similarity index 100%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
rename to components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
similarity index 100%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
rename to components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
similarity index 100%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
rename to components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
similarity index 100%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
rename to components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
similarity index 100%
rename from components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
rename to components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
diff --git a/components/camel-cdi-jta/src/main/resources/META-INF/beans.xml b/components/camel-cdi-jta/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000..109cc2c
--- /dev/null
+++ b/components/camel-cdi-jta/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<beans version="1.0" bean-discovery-mode="all">
+
+ <scan>
+ <exclude name="org.apache.camel.cdi.transaction.*">
+ <if-class-not-available name="javax.transaction.Transaction"/>
+ </exclude>
+ </scan>
+
+</beans>
\ No newline at end of file
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index fea2dcb..d9722d3 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -73,10 +73,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jta</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-mock</artifactId>
</dependency>
@@ -92,14 +88,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
- <version>${jta-api-1.2-version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-cdi/src/main/docs/cdi.adoc b/components/camel-cdi/src/main/docs/cdi.adoc
index 5f9c937..3102a69 100644
--- a/components/camel-cdi/src/main/docs/cdi.adoc
+++ b/components/camel-cdi/src/main/docs/cdi.adoc
@@ -689,6 +689,8 @@ configuration, e.g.:
== Transaction support
+NOTE: You must add camel-cdi-jta JAR as dependency for Camel CDI transaction support.
+
Camel CDI provides support for Camel transactional client using JTA.
That support is optional hence you need to have JTA in your application classpath, e.g., by explicitly add JTA as a dependency when using Maven:
@@ -771,7 +773,7 @@ The list of supported transaction policy names is:
Camel CDI provides a transactional error handler that extends the redelivery error handler, forces a rollback whenever an exception occurs and creates a new transaction for each redelivery.
-Camel CDI provides the `CdiRouteBuilder` class that exposes the `transactionErrorHandler` helper method to enable quick access to the configuration, e.g.:
+The `camel-cdi-jta` provides the `CdiRouteBuilder` class that exposes the `transactionErrorHandler` helper method to enable quick access to the configuration, e.g.:
[source,java]
----
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
index 5875873..4c7c515 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
@@ -51,6 +51,7 @@ import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RouteTemplateDefinition;
import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.model.rest.RestDefinition;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -429,16 +430,19 @@ final class XmlCdiBeanFactory {
throw attributeNotSupported("executorServiceRef", type, definition.getId());
}
+ String fqn = type.getTypeAsClass();
+ final Class<?> clazz = ObjectHelper.loadClass(fqn);
+
return new XmlErrorHandlerFactoryBean(
manager,
new SyntheticAnnotated(
- type.getTypeAsClass(),
- manager.createAnnotatedType(type.getTypeAsClass()).getTypeClosure(),
+ clazz,
+ manager.createAnnotatedType(clazz).getTypeClosure(),
ANY, NamedLiteral.of(definition.getId())),
- type.getTypeAsClass(), bean -> "imported error handler with "
- + "id [" + definition.getId() + "] "
- + "from resource [" + url + "] "
- + "with qualifiers " + bean.getQualifiers(),
+ clazz, bean -> "imported error handler with "
+ + "id [" + definition.getId() + "] "
+ + "from resource [" + url + "] "
+ + "with qualifiers " + bean.getQualifiers(),
definition);
}
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java
index 8b087f0..a36f8b1 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java
@@ -31,6 +31,7 @@ import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.cdi.xml.ErrorHandlerDefinition;
import org.apache.camel.cdi.xml.RedeliveryPolicyFactoryBean;
import org.apache.camel.processor.errorhandler.RedeliveryPolicy;
+import org.apache.camel.util.ObjectHelper;
import static java.lang.Boolean.parseBoolean;
import static java.lang.String.format;
@@ -56,7 +57,9 @@ final class XmlErrorHandlerFactoryBean extends SyntheticBean<ErrorHandlerBuilder
@Override
public ErrorHandlerBuilder create(CreationalContext<ErrorHandlerBuilder> creationalContext) {
try {
- ErrorHandlerBuilder builder = handler.getType().getTypeAsClass().newInstance();
+ String fqn = handler.getType().getTypeAsClass();
+ Class<?> clazz = ObjectHelper.loadClass(fqn);
+ ErrorHandlerBuilder builder = (ErrorHandlerBuilder) clazz.newInstance();
switch (handler.getType()) {
case DefaultErrorHandler:
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
index 6624a4f..1bd1bc6 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
@@ -21,9 +21,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.camel.builder.DeadLetterChannelBuilder;
import org.apache.camel.builder.DefaultErrorHandlerBuilder;
-import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.builder.NoErrorHandlerBuilder;
-import org.apache.camel.jta.JtaTransactionErrorHandlerBuilder;
/**
* Used to configure the errorHandler type
@@ -39,20 +37,20 @@ public enum ErrorHandlerType {
TransactionErrorHandler;
/**
- * Get the type as class.
+ * Get the type as class FQN name.
*
* @return the class which represents the selected type.
*/
- public Class<? extends ErrorHandlerBuilder> getTypeAsClass() {
+ public String getTypeAsClass() {
switch (this) {
case DefaultErrorHandler:
- return DefaultErrorHandlerBuilder.class;
+ return DefaultErrorHandlerBuilder.class.getName();
case DeadLetterChannel:
- return DeadLetterChannelBuilder.class;
+ return DeadLetterChannelBuilder.class.getName();
case NoErrorHandler:
- return NoErrorHandlerBuilder.class;
+ return NoErrorHandlerBuilder.class.getName();
case TransactionErrorHandler:
- return JtaTransactionErrorHandlerBuilder.class;
+ return "org.apache.camel.jta.JtaTransactionErrorHandlerBuilder";
default:
throw new IllegalArgumentException("Unknown error handler: " + this);
}
diff --git a/parent/pom.xml b/parent/pom.xml
index e55e886..844b03d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1117,6 +1117,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-cdi-jta</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cdi-main</artifactId>
<version>${project.version}</version>
</dependency>