JAVA-2815: Transaction state updates

Change transaction state on first operation after commit from DONE to
NONE, and after abort from ABORTED to NONE.

Author: jyemin

driver-async/src/main/com/mongodb/async/client/ClientSessionImpl.java

@@ -32,12 +32,12 @@
 class ClientSessionImpl extends BaseClientSessionImpl implements ClientSession {
 
     private enum TransactionState {
-        NONE, IN, DONE, ABORTED
+        NONE, IN, COMMITTED, ABORTED
     }
 
     private final OperationExecutor executor;
     private TransactionState transactionState = TransactionState.NONE;
-    private boolean messageSent;
+    private boolean messageSentInCurrentTransaction;
     private boolean commitInProgress;
 
     private TransactionOptions transactionOptions;
@@ -50,19 +50,26 @@ private enum TransactionState {
 
     @Override
     public boolean hasActiveTransaction() {
-        return transactionState == TransactionState.IN || (transactionState == TransactionState.DONE && commitInProgress);
+        return transactionState == TransactionState.IN || (transactionState == TransactionState.COMMITTED && commitInProgress);
     }
 
     @Override
     public boolean notifyMessageSent() {
-        boolean firstMessage = !messageSent;
-        messageSent = true;
-        return firstMessage;
+        if (hasActiveTransaction()) {
+            boolean firstMessageInCurrentTransaction = !messageSentInCurrentTransaction;
+            messageSentInCurrentTransaction = true;
+            return firstMessageInCurrentTransaction;
+        } else {
+            if (transactionState == TransactionState.COMMITTED || transactionState == TransactionState.ABORTED) {
+                cleanupTransaction(TransactionState.NONE);
+            }
+            return false;
+        }
     }
 
     @Override
     public TransactionOptions getTransactionOptions() {
-        isTrue("in transaction", transactionState == TransactionState.IN || transactionState == TransactionState.DONE);
+        isTrue("in transaction", transactionState == TransactionState.IN || transactionState == TransactionState.COMMITTED);
         return transactionOptions;
     }
 
@@ -77,7 +84,7 @@ public void startTransaction(final TransactionOptions transactionOptions) {
         if (transactionState == TransactionState.IN) {
             throw new IllegalStateException("Transaction already in progress");
         }
-        if (transactionState == TransactionState.DONE) {
+        if (transactionState == TransactionState.COMMITTED) {
             cleanupTransaction(TransactionState.IN);
         } else {
             transactionState = TransactionState.IN;
@@ -94,8 +101,8 @@ public void commitTransaction(final SingleResultCallback<Void> callback) {
         if (transactionState == TransactionState.NONE) {
             throw new IllegalStateException("There is no transaction started");
         }
-        if (!messageSent) {
-            cleanupTransaction(TransactionState.DONE);
+        if (!messageSentInCurrentTransaction) {
+            cleanupTransaction(TransactionState.COMMITTED);
             callback.onResult(null, null);
         } else {
             ReadConcern readConcern = transactionOptions.getReadConcern();
@@ -109,7 +116,7 @@ public void commitTransaction(final SingleResultCallback<Void> callback) {
                         @Override
                         public void onResult(final Void result, final Throwable t) {
                             commitInProgress = false;
-                            transactionState = TransactionState.DONE;
+                            transactionState = TransactionState.COMMITTED;
                             callback.onResult(result, t);
                         }
                     });
@@ -121,13 +128,13 @@ public void abortTransaction(final SingleResultCallback<Void> callback) {
         if (transactionState == TransactionState.ABORTED) {
             throw new IllegalStateException("Cannot call abortTransaction twice");
         }
-        if (transactionState == TransactionState.DONE) {
+        if (transactionState == TransactionState.COMMITTED) {
             throw new IllegalStateException("Cannot call abortTransaction after calling commitTransaction");
         }
         if (transactionState == TransactionState.NONE) {
             throw new IllegalStateException("There is no transaction started");
         }
-        if (!messageSent) {
+        if (!messageSentInCurrentTransaction) {
             cleanupTransaction(TransactionState.ABORTED);
             callback.onResult(null, null);
         } else {
@@ -163,7 +170,7 @@ public void onResult(final Void result, final Throwable t) {
     }
 
     private void cleanupTransaction(final TransactionState nextState) {
-        messageSent = false;
+        messageSentInCurrentTransaction = false;
         transactionOptions = null;
         transactionState = nextState;
     }

driver-core/src/main/com/mongodb/internal/connection/CommandMessage.java

@@ -240,10 +240,10 @@ private List<BsonElement> getExtraElements(final SessionContext sessionContext)
         if (sessionContext.hasSession() && responseExpected) {
             extraElements.add(new BsonElement("lsid", sessionContext.getSessionId()));
         }
+        boolean firstMessageInTransaction = sessionContext.notifyMessageSent();
         if (sessionContext.hasActiveTransaction()) {
             extraElements.add(new BsonElement("txnNumber", new BsonInt64(sessionContext.getTransactionNumber())));
-            boolean firstMessage = sessionContext.notifyMessageSent();
-            if (firstMessage) {
+            if (firstMessageInTransaction) {
                 extraElements.add(new BsonElement("startTransaction", BsonBoolean.TRUE));
                 addReadConcernDocument(extraElements, sessionContext);
             }

driver-core/src/main/com/mongodb/internal/connection/NoOpSessionContext.java

@@ -65,7 +65,7 @@ public long advanceTransactionNumber() {
 
     @Override
     public boolean notifyMessageSent() {
-        throw new UnsupportedOperationException();
+        return false;
     }
 
     @Override

driver-core/src/test/functional/com/mongodb/binding/SimpleSessionContext.java

@@ -70,7 +70,7 @@ public long advanceTransactionNumber() {
 
     @Override
     public boolean notifyMessageSent() {
-        throw new UnsupportedOperationException();
+        return false;
     }
 
     @Override