Squashable commit; refactoring, general edits

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>

Author: ljnelson

integrations/cdi/jpa-cdi/pom.xml

@@ -30,10 +30,13 @@
     <name>Helidon CDI Integrations JPA</name>
 
     <properties>
-      <doclint>-syntax</doclint>
-      <eclipselink.skip>false</eclipselink.skip>
-      <hibernate.skip>false</hibernate.skip>
-      <spotbugs.exclude>etc/spotbugs/exclude.xml</spotbugs.exclude>
+        <doclint>-syntax</doclint>
+        <eclipselink.skip>false</eclipselink.skip>
+        <helidon.jta.immediateEnlistment>false</helidon.jta.immediateEnlistment>
+        <helidon.jta.interposedSynchronizations>true</helidon.jta.interposedSynchronizations>
+        <helidon.jta.preemptiveEnlistmentChecks>true</helidon.jta.preemptiveEnlistmentChecks>
+        <hibernate.skip>false</hibernate.skip>
+        <spotbugs.exclude>etc/spotbugs/exclude.xml</spotbugs.exclude>
     </properties>
 
     <dependencies>
@@ -291,6 +294,9 @@
                     <reportNameSuffix>eclipselink</reportNameSuffix>
                     <skip>${eclipselink.skip}</skip>
                     <systemPropertyVariables>
+                        <helidon.jta.immediateEnlistment>${helidon.jta.immediateEnlistment}</helidon.jta.immediateEnlistment>
+                        <helidon.jta.interposedSynchronizations>${helidon.jta.interposedSynchronizations}</helidon.jta.interposedSynchronizations>
+                        <helidon.jta.preemptiveEnlistmentChecks>${helidon.jta.preemptiveEnlistmentChecks}</helidon.jta.preemptiveEnlistmentChecks>
                         <java.util.logging.config.file>${project.basedir}/src/test/logging.properties</java.util.logging.config.file>
                     </systemPropertyVariables>
                     <testClassesDirectory>${project.build.directory}/eclipselink/test-classes</testClassesDirectory>

integrations/jta/jdbc/src/main/java/io/helidon/integrations/jta/jdbc/JtaConnection.java

@@ -1275,7 +1275,7 @@ private boolean continueEnlisting() throws SQLException {
 
         this.validateTransactionStatusForEnlistment(currentThreadTransactionStatus);
 
-        if (!super.getAutoCommit()) {
+        if (this.preemptiveEnlistmentChecks && !super.getAutoCommit()) {
             // There is, as far as we can tell, a global transaction on the current thread, and super.getAutoCommit()
             // (super. on purpose, not this., to prevent a circular call to enlist()) returned false, and we aren't
             // (yet) enlisted with the global transaction, so autoCommit must have been disabled on purpose by the

integrations/jta/jdbc/src/main/java/io/helidon/integrations/jta/jdbc/LocalXAResource.java

@@ -38,6 +38,7 @@
 import static javax.transaction.xa.XAException.XAER_DUPID;
 import static javax.transaction.xa.XAException.XAER_INVAL;
 import static javax.transaction.xa.XAException.XAER_NOTA;
+import static javax.transaction.xa.XAException.XAER_OUTSIDE;
 import static javax.transaction.xa.XAException.XAER_PROTO;
 import static javax.transaction.xa.XAException.XAER_RMERR;
 import static javax.transaction.xa.XAException.XAER_RMFAIL;
@@ -171,7 +172,20 @@ private Association start(Xid x, Association a) {
             throw new UncheckedXAException((XAException) new XAException(XAER_RMERR)
                                            .initCause(new NullPointerException("connectionFunction.apply(" + x + ")")));
         }
-        a = new Association(Association.BranchState.ACTIVE, x, c);
+        if (!autoCommit(c)) {
+            // The Connection is doing work outside of a global transaction, i.e. someone else set its autoCommit status
+            // to false before this branch started, so there is work going on outside of the about-to-start branch, so
+            // if we were to call commit() on the connection we would have no idea what would be committed. The XA
+            // specification calls this "work outside of a global transaction", and says to report XAER_OUTSIDE here in
+            // such a case.
+            throw new UncheckedXAException((XAException) new XAException(XAER_OUTSIDE)
+                                           .initCause(new IllegalStateException("!c.getAutoCommit(): " + c)));
+        }
+        a = new Association(Association.BranchState.ACTIVE,
+                            x,
+                            false, // not suspended
+                            c,
+                            true); // already checked for a false autoCommit status
         if (LOGGER.isLoggable(Level.FINE)) {
             LOGGER.logp(Level.FINE, this.getClass().getName(), "start",
                         "Created new Association ({0}) for connection ({1}) in state ACTIVE", new Object[] {a, c});
@@ -407,15 +421,18 @@ private XAException convert(XARoutine xaRoutine, Throwable e) {
                 returnValue = (XAException) new XAException(XAER_PROTO).initCause(e);
             } else if (e instanceof SQLException sqlException) {
                 returnValue = this.exceptionConverter.convert(xaRoutine, sqlException);
+                if (returnValue == null) {
+                    returnValue = (XAException) new XAException(XAER_RMERR).initCause(e);
+                }
             } else if (cause instanceof SQLException sqlException) {
                 returnValue = this.exceptionConverter.convert(xaRoutine, sqlException);
+                if (returnValue == null) {
+                    returnValue = (XAException) new XAException(XAER_RMERR).initCause(e);
+                }
             } else {
                 returnValue = (XAException) new XAException(XAER_RMERR).initCause(e);
             }
         }
-        if (returnValue == null) {
-            returnValue = (XAException) new XAException(XAER_RMERR).initCause(e);
-        }
         return returnValue;
     }
 
@@ -691,6 +708,14 @@ private static String flagsToString(int flags) {
         }
     }
 
+    private static boolean autoCommit(Connection c) {
+        try {
+            return c.getAutoCommit();
+        } catch (SQLException e) {
+            throw new UncheckedSQLException(e);
+        }
+    }
+
 
     /*
      * Inner and nested classes.
@@ -781,10 +806,6 @@ record Association(BranchState branchState,
           }
          */
 
-        Association(BranchState branchState, Xid xid, Connection connection) {
-            this(branchState, xid, false, connection, autoCommit(connection));
-        }
-
         Association {
             Objects.requireNonNull(xid, "xid");
             boolean autoCommit = false;
@@ -1059,14 +1080,6 @@ private Association reset() throws SQLException {
                                    this.priorAutoCommit());
         }
 
-        private static boolean autoCommit(Connection c) {
-            try {
-                return c.getAutoCommit();
-            } catch (SQLException e) {
-                throw new UncheckedSQLException(e);
-            }
-        }
-
         // Transaction Branch States (XA specification, table 6-4):
         // S0: Non-existent Transaction
         // S1: Active