Refactoring: remove unused parameters from OperationHelper.canRetryWrite/canRetryRead

JAVA-5956, JAVA-6117, JAVA-6113, JAVA-6119, JAVA-6141

Author: stIncMale

driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java

@@ -199,9 +199,7 @@ static <D, T> void executeRetryableReadAsync(
                         withAsyncSourceAndConnection(sourceAsyncFunction, false, operationContext, funcCallback,
                                 (source, connection, operationContextWithMinRtt, releasingCallback) -> {
                                     if (retryState.breakAndCompleteIfRetryAnd(
-                                            () -> !OperationHelper.canRetryRead(source.getServerDescription(),
-                                                    operationContextWithMinRtt),
-                                            releasingCallback)) {
+                                            () -> !OperationHelper.canRetryRead(operationContextWithMinRtt), releasingCallback)) {
                                         return;
                                     }
                                     createReadCommandAndExecuteAsync(retryState, operationContextWithMinRtt, source, database,
@@ -278,8 +276,7 @@ static <T, R> void executeRetryableWriteAsync(
                                 ? releasingCallback
                                 : addingRetryableLabelCallback(releasingCallback, maxWireVersion);
                         if (retryState.breakAndCompleteIfRetryAnd(() ->
-                                        !OperationHelper.canRetryWrite(connection.getDescription(), operationContextWithMinRtt.getSessionContext()),
-                                addingRetryableLabelCallback)) {
+                                        !OperationHelper.canRetryWrite(connection.getDescription()), addingRetryableLabelCallback)) {
                             return;
                         }
                         BsonDocument command;

driver-core/src/main/com/mongodb/internal/operation/FindOperation.java

@@ -303,7 +303,7 @@ public BatchCursor<T> execute(final ReadBinding binding, final OperationContext
         Supplier<BatchCursor<T>> read = decorateReadWithRetries(retryState, findOperationContext, () ->
                 withSourceAndConnection(binding::getReadConnectionSource, false,
                         (source, connection, commandOperationContext) -> {
-                            retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), commandOperationContext));
+                            retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(commandOperationContext));
                 try {
                     return createReadCommandAndExecute(retryState, commandOperationContext, source, namespace.getDatabaseName(),
                                                        getCommandCreator(), CommandResultDocumentCodec.create(decoder, FIRST_BATCH),
@@ -331,8 +331,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext
                 retryState, operationContext, (AsyncCallbackSupplier<AsyncBatchCursor<T>>) funcCallback ->
                     withAsyncSourceAndConnection(binding::getReadConnectionSource, false, findOperationContext, funcCallback,
                             (source, connection,   operationContextWithMinRTT, releasingCallback) -> {
-                                if (retryState.breakAndCompleteIfRetryAnd(() -> !canRetryRead(source.getServerDescription(),
-                                        findOperationContext), releasingCallback)) {
+                                if (retryState.breakAndCompleteIfRetryAnd(() -> !canRetryRead(findOperationContext), releasingCallback)) {
                                     return;
                                 }
                                 SingleResultCallback<AsyncBatchCursor<T>> wrappedCallback = exceptionTransformingCallback(releasingCallback);

driver-core/src/main/com/mongodb/internal/operation/ListCollectionsOperation.java

@@ -178,7 +178,7 @@ public BatchCursor<T> execute(final ReadBinding binding, final OperationContext
         RetryState retryState = initialRetryState(retryReads, listCollectionsOperationContext.getTimeoutContext());
         Supplier<BatchCursor<T>> read = decorateReadWithRetries(retryState, listCollectionsOperationContext, () ->
             withSourceAndConnection(binding::getReadConnectionSource, false, (source, connection, operationContextWithMinRTT) -> {
-                retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), operationContextWithMinRTT));
+                retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(operationContextWithMinRTT));
                 try {
                     return createReadCommandAndExecute(retryState, operationContextWithMinRTT, source, databaseName,
                                                        getCommandCreator(), createCommandDecoder(), transformer(), connection);
@@ -202,8 +202,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext
                 retryState, listCollectionsOperationContext, (AsyncCallbackSupplier<AsyncBatchCursor<T>>) funcCallback ->
                     withAsyncSourceAndConnection(binding::getReadConnectionSource, false, listCollectionsOperationContext, funcCallback,
                             (source, connection, operationContextWithMinRtt, releasingCallback) -> {
-                                if (retryState.breakAndCompleteIfRetryAnd(() -> !canRetryRead(source.getServerDescription(),
-                                        operationContextWithMinRtt), releasingCallback)) {
+                                if (retryState.breakAndCompleteIfRetryAnd(() -> !canRetryRead(operationContextWithMinRtt), releasingCallback)) {
                                     return;
                                 }
                                 createReadCommandAndExecuteAsync(retryState, operationContextWithMinRtt, source, databaseName,

driver-core/src/main/com/mongodb/internal/operation/ListIndexesOperation.java

@@ -135,7 +135,7 @@ public BatchCursor<T> execute(final ReadBinding binding, final OperationContext
         RetryState retryState = initialRetryState(retryReads, listIndexesOperationContext.getTimeoutContext());
         Supplier<BatchCursor<T>> read = decorateReadWithRetries(retryState, listIndexesOperationContext, () ->
             withSourceAndConnection(binding::getReadConnectionSource, false, (source, connection, operationContextWithMinRTT) -> {
-                retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), operationContextWithMinRTT));
+                retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(operationContextWithMinRTT));
                 try {
                     return createReadCommandAndExecute(retryState, operationContextWithMinRTT, source, namespace.getDatabaseName(),
                                                        getCommandCreator(), createCommandDecoder(), transformer(), connection);
@@ -158,8 +158,7 @@ public void executeAsync(final AsyncReadBinding binding, final OperationContext
                 retryState, listIndexesOperationContext, (AsyncCallbackSupplier<AsyncBatchCursor<T>>) funcCallback ->
                     withAsyncSourceAndConnection(binding::getReadConnectionSource, false, listIndexesOperationContext, funcCallback,
                             (source, connection, operationContextWithMinRtt, releasingCallback) -> {
-                                if (retryState.breakAndCompleteIfRetryAnd(() -> !canRetryRead(source.getServerDescription(),
-                                        operationContextWithMinRtt), releasingCallback)) {
+                                if (retryState.breakAndCompleteIfRetryAnd(() -> !canRetryRead(operationContextWithMinRtt), releasingCallback)) {
                                     return;
                                 }
                                 createReadCommandAndExecuteAsync(retryState, operationContextWithMinRtt, source,

driver-core/src/main/com/mongodb/internal/operation/OperationHelper.java

@@ -23,7 +23,6 @@
 import com.mongodb.client.cursor.TimeoutMode;
 import com.mongodb.client.model.Collation;
 import com.mongodb.connection.ConnectionDescription;
-import com.mongodb.connection.ServerDescription;
 import com.mongodb.connection.ServerType;
 import com.mongodb.internal.TimeoutContext;
 import com.mongodb.internal.async.SingleResultCallback;
@@ -168,11 +167,11 @@ static boolean isRetryableWrite(final boolean retryWrites, final WriteConcern wr
             LOGGER.debug("retryWrites set to true but in an active transaction.");
             return false;
         } else {
-            return canRetryWrite(connectionDescription, sessionContext);
+            return canRetryWrite(connectionDescription);
         }
     }
 
-    static boolean canRetryWrite(final ConnectionDescription connectionDescription, final SessionContext sessionContext) {
+    static boolean canRetryWrite(final ConnectionDescription connectionDescription) {
         if (connectionDescription.getLogicalSessionTimeoutMinutes() == null) {
             LOGGER.debug("retryWrites set to true but the server does not support sessions.");
             return false;
@@ -183,7 +182,7 @@ static boolean canRetryWrite(final ConnectionDescription connectionDescription,
         return true;
     }
 
-    static boolean canRetryRead(final ServerDescription serverDescription, final OperationContext operationContext) {
+    static boolean canRetryRead(final OperationContext operationContext) {
         if (operationContext.getSessionContext().hasActiveTransaction()) {
             LOGGER.debug("retryReads set to true but in an active transaction.");
             return false;

driver-core/src/main/com/mongodb/internal/operation/SyncOperationHelper.java

@@ -206,7 +206,7 @@ static <D, T> T executeRetryableRead(
 
         Supplier<T> read = decorateReadWithRetries(retryState, operationContext, () ->
                 withSourceAndConnection(readConnectionSourceSupplier, false, (source, connection, operationContextWithMinRtt) -> {
-                    retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(source.getServerDescription(), operationContextWithMinRtt));
+                    retryState.breakAndThrowIfRetryAnd(() -> !canRetryRead(operationContextWithMinRtt));
                     return createReadCommandAndExecute(retryState, operationContextWithMinRtt, source, database,
                                                        commandCreator, decoder, transformer, connection);
                 }, operationContext)
@@ -270,7 +270,7 @@ static <T, R> R executeRetryableWrite(
             return withSourceAndConnection(binding::getWriteConnectionSource, true, (source, connection, operationContextWithMinRtt) -> {
                 int maxWireVersion = connection.getDescription().getMaxWireVersion();
                 try {
-                    retryState.breakAndThrowIfRetryAnd(() -> !canRetryWrite(connection.getDescription(), sessionContext));
+                    retryState.breakAndThrowIfRetryAnd(() -> !canRetryWrite(connection.getDescription()));
                     BsonDocument command = retryState.attachment(AttachmentKeys.command())
                             .map(previousAttemptCommand -> {
                                 assertFalse(firstAttempt);

driver-core/src/test/unit/com/mongodb/internal/operation/OperationHelperSpecification.groovy

@@ -21,7 +21,6 @@ import com.mongodb.client.model.Collation
 import com.mongodb.connection.ClusterId
 import com.mongodb.connection.ConnectionDescription
 import com.mongodb.connection.ConnectionId
-import com.mongodb.connection.ServerDescription
 import com.mongodb.connection.ServerId
 import com.mongodb.internal.bulk.DeleteRequest
 import com.mongodb.internal.bulk.UpdateRequest
@@ -35,7 +34,6 @@ import spock.lang.Specification
 import static com.mongodb.ClusterFixture.OPERATION_CONTEXT
 import static com.mongodb.WriteConcern.ACKNOWLEDGED
 import static com.mongodb.WriteConcern.UNACKNOWLEDGED
-import static com.mongodb.connection.ServerConnectionState.CONNECTED
 import static com.mongodb.connection.ServerType.REPLICA_SET_PRIMARY
 import static com.mongodb.connection.ServerType.STANDALONE
 import static com.mongodb.internal.operation.OperationHelper.canRetryRead
@@ -108,8 +106,8 @@ class OperationHelperSpecification extends Specification {
         }
 
         expect:
-        canRetryRead(retryableServerDescription, OPERATION_CONTEXT.withSessionContext(noTransactionSessionContext))
-        !canRetryRead(retryableServerDescription, OPERATION_CONTEXT.withSessionContext(activeTransactionSessionContext))
+        canRetryRead(OPERATION_CONTEXT.withSessionContext(noTransactionSessionContext))
+        !canRetryRead(OPERATION_CONTEXT.withSessionContext(activeTransactionSessionContext))
     }
 
 
@@ -121,10 +119,5 @@ class OperationHelperSpecification extends Specification {
     static ConnectionDescription threeFourConnectionDescription = new ConnectionDescription(connectionId, 5,
             STANDALONE, 1000, 100000, 100000, [], new BsonArray(), null)
 
-    static ServerDescription retryableServerDescription = ServerDescription.builder().address(new ServerAddress()).state(CONNECTED)
-            .logicalSessionTimeoutMinutes(1).build()
-    static ServerDescription nonRetryableServerDescription = ServerDescription.builder().address(new ServerAddress())
-            .state(CONNECTED).build()
-
     static Collation enCollation = Collation.builder().locale('en').build()
 }