Moved @Rollback to its own module quarkusio#24500

(cherry picked from commit 77c441d)
gsmet · Mar 29, 2022 · 42c9dd7 · 42c9dd7
1 parent cc37101
commit 42c9dd7
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 6 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -1558,6 +1558,11 @@
                 <artifactId>quarkus-resteasy-server-common-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-transaction-annotations</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-narayana-jta</artifactId>

diff --git a/...narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/AnnotatedError.java b/...narayana-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/AnnotatedError.java
@@ -1,6 +1,6 @@
 package io.quarkus.narayana.interceptor;
 
-import io.quarkus.narayana.jta.Rollback;
+import io.quarkus.transaction.annotations.Rollback;
 
 // prevent a rollback to counter the default
 @Rollback(false)

diff --git a/...-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/AnnotatedTestException.java b/...-jta/deployment/src/test/java/io/quarkus/narayana/interceptor/AnnotatedTestException.java
@@ -1,6 +1,6 @@
 package io.quarkus.narayana.interceptor;
 
-import io.quarkus.narayana.jta.Rollback;
+import io.quarkus.transaction.annotations.Rollback;
 
 // force a rollback to counter the default
 @Rollback

diff --git a/extensions/narayana-jta/runtime/pom.xml b/extensions/narayana-jta/runtime/pom.xml
@@ -21,6 +21,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-transaction-annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-mutiny</artifactId>

diff --git a/...c/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java b/...c/main/java/io/quarkus/narayana/jta/runtime/interceptor/TransactionalInterceptorBase.java
@@ -27,9 +27,9 @@
 import com.arjuna.ats.jta.logging.jtaLogger;
 
 import io.quarkus.arc.runtime.InterceptorBindings;
-import io.quarkus.narayana.jta.Rollback;
 import io.quarkus.narayana.jta.runtime.CDIDelegatingTransactionManager;
 import io.quarkus.narayana.jta.runtime.TransactionConfiguration;
+import io.quarkus.transaction.annotations.Rollback;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.reactive.converters.ReactiveTypeConverter;
 import io.smallrye.reactive.converters.Registry;

diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -78,6 +78,7 @@
         <module>redis-client</module>
 
         <!-- Data access and validation -->
+        <module>transaction-annotations</module>
         <module>narayana-jta</module>
         <module>narayana-stm</module>
         <module>narayana-lra</module>

diff --git a/extensions/transaction-annotations/pom.xml b/extensions/transaction-annotations/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-extensions-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-transaction-annotations-parent</artifactId>
+    <name>Quarkus - Transaction Annotations</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/transaction-annotations/runtime/pom.xml b/extensions/transaction-annotations/runtime/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-transaction-annotations-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-transaction-annotations</artifactId>
+    <name>Quarkus - Transaction Annotations - Runtime</name>
+    <description>Transaction Annotations - Runtime</description>
+    <dependencies>
+    </dependencies>
+
+    <build>
+    </build>
+</project>
diff --git a/...ava/io/quarkus/narayana/jta/Rollback.java → ...kus/transaction/annotations/Rollback.java b/...ava/io/quarkus/narayana/jta/Rollback.java → ...kus/transaction/annotations/Rollback.java
@@ -1,4 +1,4 @@
-package io.quarkus.narayana.jta;
+package io.quarkus.transaction.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -10,8 +10,6 @@
 /**
  * If you annotate your exception with this annotation, the transactional interceptor will
  * use the exception's instructions to force a rollback or not.
- *
- * FIXME: move to SPI so it can be used by TransactionalReactive
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)