Codenarc / checkstyle fixes and cleanups

Author: rozza

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

@@ -309,7 +309,7 @@ private void releaseServerAndClientResources(final AsyncConnection connection) {
             callbackSupplier.whenComplete(() -> {
                 unsetServerCursor();
                 releaseClientResources();
-            }).whenComplete(connection::release).get((r,t) -> { /* do nothing */ });
+            }).whenComplete(connection::release).get((r, t) -> { /* do nothing */ });
         }
 
         private void killServerCursor(final MongoNamespace namespace, final ServerCursor localServerCursor,

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

@@ -96,8 +96,8 @@ public List<T> tryNext() {
         return resumeableOperation(commandBatchCursor -> {
             try {
                 List<RawBsonDocument> tryNext = commandBatchCursor.tryNext();
-                return tryNext == null ? null :
-                        convertAndProduceLastId(tryNext, changeStreamOperation.getDecoder(), lastId -> resumeToken = lastId);
+                return tryNext == null ? null
+                        : convertAndProduceLastId(tryNext, changeStreamOperation.getDecoder(), lastId -> resumeToken = lastId);
             } finally {
                 cachePostBatchResumeToken(commandBatchCursor);
             }

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

@@ -32,7 +32,6 @@
 import org.bson.BsonValue;
 import org.bson.FieldNameValidator;
 
-import static com.mongodb.internal.operation.CursorHelper.getNumberToReturn;
 import static com.mongodb.internal.operation.DocumentHelper.putIfNotNull;
 import static com.mongodb.internal.operation.OperationHelper.LOGGER;
 import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionFourDotFour;

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

@@ -22,34 +22,6 @@
 
 final class CursorHelper {
 
-    /**
-     * <p>Gets the limit of the number of documents in the OP_REPLY response to the get more request. A value of zero tells the server to
-     * use the default size. A negative value tells the server to return no more than that number and immediately close the cursor.
-     * Otherwise, the server will return no more than that number and return the same cursorId to allow the rest of the documents to be
-     * fetched, if it turns out there are more documents.</p>
-     *
-     * <p>The value returned by this method is based on the limit, the batch size, both of which can be positive, negative, or zero, and the
-     * number of documents fetched so far.</p>
-     *
-     * @return the value for numberToReturn in the OP_GET_MORE wire protocol message.
-     * @mongodb.driver.manual ../meta-driver/latest/legacy/mongodb-wire-protocol/#op-get-more OP_GET_MORE
-     * @param limit the user-specified limit on the number of results returned
-     * @param batchSize the user-specified batch size
-     * @param numReturnedSoFar the number of results returned so far
-     */
-    static int getNumberToReturn(final int limit, final int batchSize, final int numReturnedSoFar) {
-        int numberToReturn;
-        if (Math.abs(limit) != 0) {
-            numberToReturn = Math.abs(limit) - numReturnedSoFar;
-            if (batchSize != 0 && numberToReturn > Math.abs(batchSize)) {
-                numberToReturn = batchSize;
-            }
-        } else {
-            numberToReturn = batchSize;
-        }
-        return numberToReturn;
-    }
-
     static BsonDocument getCursorDocumentFromBatchSize(@Nullable final Integer batchSize) {
         return batchSize == null ? new BsonDocument() : new BsonDocument("batchSize", new BsonInt32(batchSize));
     }

driver-core/src/test/resources/unified-test-format/command-monitoring/find.json

@@ -390,6 +390,7 @@
     },
     {
       "description": "A successful find event with a getmore and the server kills the cursor (<= 4.4)",
+      "comment": "UPDATED final batchSize to 3 as batchSize is no longer calculated see: DRIVERS-1448 ",
       "runOnRequirements": [
         {
           "minServerVersion": "3.1",
@@ -483,7 +484,7 @@
                     ]
                   },
                   "collection": "test",
-                  "batchSize": 1
+                  "batchSize": 3
                 },
                 "commandName": "getMore",
                 "databaseName": "command-monitoring-tests"

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

@@ -224,7 +224,7 @@ class AsyncCommandBatchCursorSpecification extends Specification {
         }
 
         then:
-        if(responseCursorId > 0) {
+        if (responseCursorId > 0) {
             1 * secondConnection.commandAsync(*_) >> {
                 // `killCursors` command
                 ((SingleResultCallback<?>) it.last()).onResult(null, null)

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

@@ -128,7 +128,7 @@ class CommandBatchCursorSpecification extends Specification {
         then:
         cursor.next() == FIRST_BATCH
 
-        then:  
+        then:
         initialConnection.getCount() == 0
         connectionSource.getCount() == 0
 
@@ -177,7 +177,7 @@ class CommandBatchCursorSpecification extends Specification {
 
         then:
         0 * connectionA._
-        0 * connectionB._  
+        0 * connectionB._
         initialConnection.getCount() == 0
         connectionSource.getCount() == 0
 
@@ -220,7 +220,7 @@ class CommandBatchCursorSpecification extends Specification {
         }
 
         then:
-        if(responseCursorId > 0) {
+        if (responseCursorId > 0) {
             1 * secondConnection.command(*_) >> null
         }
 
@@ -422,11 +422,6 @@ class CommandBatchCursorSpecification extends Specification {
     def 'should handle exceptions when killing cursor and a connection can not be obtained'() {
         given:
         def initialConnection = referenceCountedConnection()
-        def connection = Mock(Connection) {
-            _ * getDescription() >> Stub(ConnectionDescription) {
-                getMaxWireVersion() >> 4
-            }
-        }
         def connectionSource = Stub(ConnectionSource) {
             getConnection() >> { throw new MongoSocketOpenException("can't open socket", SERVER_ADDRESS, new IOException()) }
             getServerApi() >> null