https://github.com/atomikos/transactions-essentials/issues/213

Builder for Rest Client of remote-transactions. Backport von Version 6 auf Version 5
aubelix · Jul 6, 2024 · 9cbdeb5 · 9cbdeb5
1 parent f78db88
commit 9cbdeb5
Show file tree

Hide file tree

Showing 24 changed files with 147 additions and 84 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.atomikos</groupId>
 	<artifactId>atomikos-parent</artifactId>
-	<version>5.0.9.20</version>
+	<version>5.0.9.21</version>
 	<!-- With maven, a parent pom MUST have "pom" for packaging -->
 	<packaging>pom</packaging>
 	<name>Atomikos All POM</name>

diff --git a/public/atomikos-transactions-essentials/pom.xml b/public/atomikos-transactions-essentials/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.atomikos</groupId>
 		<artifactId>ate</artifactId>
-		<version>5.0.9.20</version>
+		<version>5.0.9.21</version>
 	</parent>
 	<artifactId>atomikos-transactions-essentials</artifactId>
 	<!-- "bom" project for the open source modules -->
@@ -13,62 +13,62 @@
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>transactions-jdbc</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>transactions-jms</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>transactions-hibernate3</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>transactions-hibernate4</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>transactions-hibernate2</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>transactions-eclipselink</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>transactions-jndi-provider</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>transactions</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>transactions-api</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>transactions-jta</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>transactions-osgi</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 			<dependency>
 				<groupId>com.atomikos</groupId>
 				<artifactId>atomikos-util</artifactId>
-				<version>5.0.9.20</version>
+				<version>5.0.9.21</version>
 			</dependency>
 
 		</dependencies>

diff --git a/public/pom.xml b/public/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.atomikos</groupId>
 		<artifactId>atomikos-parent</artifactId>
-		<version>5.0.9.20</version>
+		<version>5.0.9.21</version>
 	</parent>
 	<artifactId>ate</artifactId>
 	<packaging>pom</packaging>

diff --git a/public/transactions-api/pom.xml b/public/transactions-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.atomikos</groupId>
 		<artifactId>ate</artifactId>
-		<version>5.0.9.20</version>
+		<version>5.0.9.21</version>
 	</parent>
 	<artifactId>transactions-api</artifactId>
 	<name>Transactions API</name>

diff --git a/public/transactions-api/src/main/java/com/atomikos/icatch/provider/ConfigProperties.java b/public/transactions-api/src/main/java/com/atomikos/icatch/provider/ConfigProperties.java
@@ -35,6 +35,8 @@ public final class ConfigProperties {
 	public static final String DEFAULT_MAX_WAIT_TIME_ON_SHUTDOWN = "com.atomikos.icatch.default_max_wait_time_on_shutdown";
     public static final String THROW_ON_HEURISTIC = "com.atomikos.icatch.throw_on_heuristic";
     public static final String JVM_ID_PROPERTY_NAME = "com.atomikos.icatch.jvm_id";
+    public static final String REST_CLIENT_BUILDER = "com.atomikos.remoting.rest_client_builder";
+
 
 
 	/**
@@ -266,6 +268,11 @@ public String getJvmId() {
         return getProperty(JVM_ID_PROPERTY_NAME);
 
     }
+
+    public String getRestClientBuilder() {
+        return getProperty(REST_CLIENT_BUILDER);
+
+    }
 
 
 }
diff --git a/public/transactions-eclipselink/pom.xml b/public/transactions-eclipselink/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>ate</artifactId>
 		<groupId>com.atomikos</groupId>
-		<version>5.0.9.20</version>
+		<version>5.0.9.21</version>
 	</parent>
 	<artifactId>transactions-eclipselink</artifactId>
 	<dependencies>
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>com.atomikos</groupId>
 			<artifactId>transactions-jta</artifactId>
-			<version>5.0.9.20</version>
+			<version>5.0.9.21</version>
 		</dependency>
 		<dependency>
             <groupId>org.apache.geronimo.specs</groupId>

diff --git a/public/transactions-hibernate2/pom.xml b/public/transactions-hibernate2/pom.xml
@@ -4,15 +4,15 @@
     <parent>
         <groupId>com.atomikos</groupId>
         <artifactId>ate</artifactId>
-        <version>5.0.9.20</version>
+        <version>5.0.9.21</version>
     </parent>
     <artifactId>transactions-hibernate2</artifactId>
     <name>Transactions Hibernate2</name>
     <dependencies>
         <dependency>
             <groupId>com.atomikos</groupId>
             <artifactId>transactions-jta</artifactId>
-            <version>5.0.9.20</version>
+            <version>5.0.9.21</version>
         </dependency>
         <dependency>
             <groupId>net.sf.hibernate</groupId>

diff --git a/public/transactions-hibernate3/pom.xml b/public/transactions-hibernate3/pom.xml
@@ -4,20 +4,20 @@
     <parent>
         <groupId>com.atomikos</groupId>
         <artifactId>ate</artifactId>
-        <version>5.0.9.20</version>
+        <version>5.0.9.21</version>
     </parent>
     <artifactId>transactions-hibernate3</artifactId>
     <name>Transactions Hibernate3</name>
     <dependencies>
         <dependency>
             <groupId>com.atomikos</groupId>
             <artifactId>transactions-jta</artifactId>
-            <version>5.0.9.20</version>
+            <version>5.0.9.21</version>
         </dependency>
         <dependency>
             <groupId>com.atomikos</groupId>
             <artifactId>transactions-jdbc</artifactId>
-            <version>5.0.9.20</version>
+            <version>5.0.9.21</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>

diff --git a/public/transactions-hibernate4/pom.xml b/public/transactions-hibernate4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.atomikos</groupId>
         <artifactId>ate</artifactId>
-        <version>5.0.9.20</version>
+        <version>5.0.9.21</version>
     </parent>
     <properties>
 		<transform.skip>false</transform.skip>
@@ -15,13 +15,13 @@
         <dependency>
             <groupId>com.atomikos</groupId>
             <artifactId>transactions-jta</artifactId>
-            <version>5.0.9.20</version>
+            <version>5.0.9.21</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.atomikos</groupId>
             <artifactId>transactions-jdbc</artifactId>
-            <version>5.0.9.20</version>
+            <version>5.0.9.21</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/public/transactions-jdbc/pom.xml b/public/transactions-jdbc/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.atomikos</groupId>
         <artifactId>ate</artifactId>
-        <version>5.0.9.20</version>
+        <version>5.0.9.21</version>
     </parent>
     <artifactId>transactions-jdbc</artifactId>
     <name>Transactions JDBC</name>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.atomikos</groupId>
             <artifactId>transactions-jta</artifactId>
-            <version>5.0.9.20</version>
+            <version>5.0.9.21</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/public/transactions-jms/pom.xml b/public/transactions-jms/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.atomikos</groupId>
         <artifactId>ate</artifactId>
-        <version>5.0.9.20</version>
+        <version>5.0.9.21</version>
     </parent>
     <artifactId>transactions-jms</artifactId>
     <name>Transactions JMS</name>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.atomikos</groupId>
             <artifactId>transactions-jta</artifactId>
-            <version>5.0.9.20</version>
+            <version>5.0.9.21</version>
             <scope>provided</scope>
         </dependency>
 		<dependency>

diff --git a/public/transactions-jndi-provider/pom.xml b/public/transactions-jndi-provider/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.atomikos</groupId>
 		<artifactId>ate</artifactId>
-		<version>5.0.9.20</version>
+		<version>5.0.9.21</version>
 	</parent>
 	<artifactId>transactions-jndi-provider</artifactId>
 		<properties>
@@ -13,12 +13,12 @@
 		<dependency>
 			<groupId>com.atomikos</groupId>
 			<artifactId>transactions-jms</artifactId>
-			<version>5.0.9.20</version>
+			<version>5.0.9.21</version>
 		</dependency>
 		<dependency>
 			<groupId>com.atomikos</groupId>
 			<artifactId>transactions-jdbc</artifactId>
-			<version>5.0.9.20</version>
+			<version>5.0.9.21</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>

diff --git a/public/transactions-jta/pom.xml b/public/transactions-jta/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.atomikos</groupId>
         <artifactId>ate</artifactId>
-        <version>5.0.9.20</version>
+        <version>5.0.9.21</version>
     </parent>
     <artifactId>transactions-jta</artifactId>
     <name>Transactions JTA</name>
@@ -15,18 +15,18 @@
         <dependency>
             <groupId>com.atomikos</groupId>
             <artifactId>transactions-api</artifactId>
-            <version>5.0.9.20</version>
+            <version>5.0.9.21</version>
         </dependency>
         <dependency>
             <groupId>com.atomikos</groupId>
             <artifactId>transactions</artifactId>
-            <version>5.0.9.20</version>
+            <version>5.0.9.21</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>com.atomikos</groupId>
             <artifactId>atomikos-util</artifactId>
-            <version>5.0.9.20</version>
+            <version>5.0.9.21</version>
         </dependency>
 		<dependency>
   			<groupId>jakarta.jms</groupId>

diff --git a/public/transactions-osgi/pom.xml b/public/transactions-osgi/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.atomikos</groupId>
 		<artifactId>ate</artifactId>
-		<version>5.0.9.20</version>
+		<version>5.0.9.21</version>
 	</parent>
 	<artifactId>transactions-osgi</artifactId>
 	<name>Transactions OSGi</name>
@@ -89,13 +89,13 @@
 		<dependency>
 			<groupId>com.atomikos</groupId>
 			<artifactId>transactions-jdbc</artifactId>
-			<version>5.0.9.20</version>
+			<version>5.0.9.21</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.atomikos</groupId>
 			<artifactId>transactions-jms</artifactId>
-			<version>5.0.9.20</version>
+			<version>5.0.9.21</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

diff --git a/public/transactions-remoting/pom.xml b/public/transactions-remoting/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.atomikos</groupId>
 		<artifactId>ate</artifactId>
-		<version>5.0.9.20</version>
+		<version>5.0.9.21</version>
 	</parent>
 	<artifactId>transactions-remoting</artifactId>
 		<properties>
@@ -13,13 +13,13 @@
 		<dependency>
 			<groupId>com.atomikos</groupId>
 			<artifactId>transactions-jta</artifactId>
-			<version>5.0.9.20</version>
+			<version>5.0.9.21</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.atomikos</groupId>
 			<artifactId>transactions</artifactId>
-			<version>5.0.9.20</version>
+			<version>5.0.9.21</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>

diff --git a/...sactions-remoting/src/main/java/com/atomikos/remoting/twopc/DefaultRestClientBuilder.java b/...sactions-remoting/src/main/java/com/atomikos/remoting/twopc/DefaultRestClientBuilder.java
@@ -0,0 +1,18 @@
+package com.atomikos.remoting.twopc;
+
+import static javax.ws.rs.client.ClientBuilder.newClient;
+
+import javax.ws.rs.client.Client;
+
+/**
+ * Default provider for standard Jaxrs Client without connection pool
+ */
+public class DefaultRestClientBuilder extends RestClientBuilder {
+
+	public Client build() {
+		Client client = newClient();
+		client.property("jersey.config.client.suppressHttpComplianceValidation", true);
+		client.register(ParticipantsProvider.class);
+		return client;	
+	}
+}