PR updates

Author: rozza

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

@@ -55,7 +55,7 @@
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.MESSAGE_IF_CONCURRENT_OPERATION;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.NEXT_BATCH;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.NO_OP_FIELD_NAME_VALIDATOR;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.getCommandCursorResult;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.logCommandCursorResult;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.getKillCursorsCommand;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.getMoreCommandDocument;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.translateCommandException;
@@ -233,7 +233,9 @@ private void getMoreLoop(final AsyncConnection connection, final ServerCursor se
 
     private CommandCursorResult<T> toCommandCursorResult(final ServerAddress serverAddress, final String fieldNameContainingBatch,
             final BsonDocument commandCursorDocument) {
-        CommandCursorResult<T> commandCursorResult = getCommandCursorResult(serverAddress, fieldNameContainingBatch, commandCursorDocument);
+        CommandCursorResult<T> commandCursorResult = new CommandCursorResult<>(serverAddress, fieldNameContainingBatch,
+                commandCursorDocument);
+        logCommandCursorResult(commandCursorResult);
         this.count.addAndGet(commandCursorResult.getResults().size());
         return commandCursorResult;
     }
@@ -279,7 +281,6 @@ void doClose() {
             }
 
             if (getServerCursor() != null) {
-                // Don't handle corrupted connections
                 getConnection((connection, t) -> {
                     if (connection != null) {
                         releaseServerAndClientResources(connection, (r, t1) -> connection.release());
@@ -299,11 +300,11 @@ <R> void executeWithConnection(final AsyncCallableConnectionWithCallback<R> call
                     callback.onResult(null, t);
                     return;
                 }
-                callable.call(connection, (result, t1) -> {
+                callable.call(assertNotNull(connection), (result, t1) -> {
                     if (t1 instanceof MongoSocketException) {
                         onCorruptedConnection(connection, (MongoSocketException) t1);
                     }
-                    assertNotNull(connection).release();
+                    connection.release();
                     callback.onResult(result, t1);
                 });
             });

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

@@ -62,7 +62,7 @@ interface AsyncCallableWithConnection {
     }
 
     interface AsyncCallableConnectionWithCallback<T> {
-        void call(@Nullable AsyncConnection connection, SingleResultCallback<T> callback);
+        void call(AsyncConnection connection, SingleResultCallback<T> callback);
     }
 
     interface AsyncCallableWithSource {

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

@@ -53,7 +53,7 @@
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.NEXT_BATCH;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.NO_OP_FIELD_NAME_VALIDATOR;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.getKillCursorsCommand;
-import static com.mongodb.internal.operation.CommandBatchCursorHelper.getCommandCursorResult;
+import static com.mongodb.internal.operation.CommandBatchCursorHelper.logCommandCursorResult;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.getMoreCommandDocument;
 import static com.mongodb.internal.operation.CommandBatchCursorHelper.translateCommandException;
 
@@ -272,7 +272,9 @@ private void getMore() {
 
     private CommandCursorResult<T> toCommandCursorResult(final ServerAddress serverAddress, final String fieldNameContainingBatch,
             final BsonDocument commandCursorDocument) {
-        CommandCursorResult<T> commandCursorResult = getCommandCursorResult(serverAddress, fieldNameContainingBatch, commandCursorDocument);
+        CommandCursorResult<T> commandCursorResult = new CommandCursorResult<>(serverAddress, fieldNameContainingBatch,
+                commandCursorDocument);
+        logCommandCursorResult(commandCursorResult);
         this.nextBatch = commandCursorResult.getResults().isEmpty() ? null : commandCursorResult.getResults();
         this.count += commandCursorResult.getResults().size();
         return commandCursorResult;
@@ -323,7 +325,6 @@ void doClose() {
             }
             try {
                 if (getServerCursor() != null) {
-                    // Don't handle corrupted connections
                     Connection connection = getConnection();
                     try {
                         releaseServerResources(connection);

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

@@ -20,7 +20,6 @@
 import com.mongodb.MongoCursorNotFoundException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.MongoQueryException;
-import com.mongodb.ServerAddress;
 import com.mongodb.ServerCursor;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.internal.validator.NoOpFieldNameValidator;
@@ -70,10 +69,7 @@ static BsonDocument getMoreCommandDocument(
         return document;
     }
 
-    static <T> CommandCursorResult<T> getCommandCursorResult(final ServerAddress serverAddress, final String fieldNameContainingBatch,
-            final BsonDocument commandCursorDocument) {
-        CommandCursorResult<T> commandCursorResult = new CommandCursorResult<>(serverAddress, fieldNameContainingBatch,
-                commandCursorDocument);
+    static <T> CommandCursorResult<T> logCommandCursorResult(final CommandCursorResult<T> commandCursorResult) {
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug(format("Received batch of %d documents with cursorId %d from server %s", commandCursorResult.getResults().size(),
                     commandCursorResult.getCursorId(), commandCursorResult.getServerAddress()));