From b07986015ed12ad61039e5778eb5a0d39212c21d Mon Sep 17 00:00:00 2001
From: Cheng Fang <cfang@redhat.com>
Date: Wed, 7 Jun 2023 10:32:26 -0400
Subject: [PATCH] EJBCLIENT-502 Fix the use of deprecated methods in
 org.wildfly.transaction.client.provider.jboss.JBossLocalTransactionProvider.Builder
 (#631)

---
 .../client/test/LastNodeToLeaveTestCase.java  | 26 +++++++++----------
 .../ejb/client/test/TransactionTestCase.java  |  5 +---
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/test/java/org/jboss/ejb/client/test/LastNodeToLeaveTestCase.java b/src/test/java/org/jboss/ejb/client/test/LastNodeToLeaveTestCase.java
index d529c3f8c..c5fe88580 100644
--- a/src/test/java/org/jboss/ejb/client/test/LastNodeToLeaveTestCase.java
+++ b/src/test/java/org/jboss/ejb/client/test/LastNodeToLeaveTestCase.java
@@ -17,6 +17,17 @@
  */
 package org.jboss.ejb.client.test;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import jakarta.ejb.NoSuchEJBException;
 import org.jboss.ejb.client.ClusterAffinity;
 import org.jboss.ejb.client.ClusterNodeSelector;
 import org.jboss.ejb.client.EJBClient;
@@ -37,17 +48,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import jakarta.ejb.NoSuchEJBException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
 /**
  * Tests the ability of the the RemoteEJBDiscoveryProvider to detect the condition when a last node left in a cluster has crashed
  * and to remove that cluster from the discovered node registry (DNR).
@@ -127,12 +127,12 @@ public void beforeTest() throws Exception {
     }
 
     /*
-     * Returns a list of true/fase values describing current server availability.
+     * Returns a list of true/false values describing current server availability.
      */
     public static List<Boolean> getServersStarted() {
         List<Boolean> booleanList = new ArrayList<Boolean>();
         for (int i = 0; i < serversStarted.length; i++) {
-            booleanList.add(new Boolean(serversStarted[i]));
+            booleanList.add(serversStarted[i]);
         }
         return booleanList;
     }
diff --git a/src/test/java/org/jboss/ejb/client/test/TransactionTestCase.java b/src/test/java/org/jboss/ejb/client/test/TransactionTestCase.java
index 5bae2a208..035bc8f8f 100644
--- a/src/test/java/org/jboss/ejb/client/test/TransactionTestCase.java
+++ b/src/test/java/org/jboss/ejb/client/test/TransactionTestCase.java
@@ -31,7 +31,6 @@
 import com.arjuna.ats.jta.common.jtaPropertyManager;
 import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
 import jakarta.transaction.TransactionManager;
-import jakarta.transaction.TransactionSynchronizationRegistry;
 import jakarta.transaction.UserTransaction;
 import org.jboss.ejb.client.test.common.Echo;
 import org.jboss.ejb.client.test.common.StatefulEchoBean;
@@ -84,12 +83,10 @@ public static void beforeClass() throws Exception {
         jtaEnvironmentBean.setTransactionManagerClassName(TransactionManagerImple.class.getName());
         jtaEnvironmentBean.setTransactionSynchronizationRegistryClassName(TransactionSynchronizationRegistryImple.class.getName());
         final TransactionManager narayanaTm = jtaEnvironmentBean.getTransactionManager();
-        final TransactionSynchronizationRegistry narayanaTsr = jtaEnvironmentBean.getTransactionSynchronizationRegistry();
         final XATerminator xat = new XATerminator();
         final JBossLocalTransactionProvider.Builder builder = JBossLocalTransactionProvider.builder();
-        builder.setXATerminator(xat).setExtendedJBossXATerminator(xat);
+        builder.setExtendedJBossXATerminator(xat);
         builder.setTransactionManager(narayanaTm);
-        builder.setTransactionSynchronizationRegistry(narayanaTsr);
         builder.setXAResourceRecoveryRegistry(new XAResourceRecoveryRegistry() {
             @Override
             public void addXAResourceRecovery(XAResourceRecovery xaResourceRecovery) {