Ensure FindIterable.filter can handle nullable input

JAVA-3065

Author: rozza

driver-async/src/test/unit/com/mongodb/async/client/FindIterableSpecification.groovy

@@ -33,6 +33,7 @@ import org.bson.codecs.BsonValueCodecProvider
 import org.bson.codecs.DocumentCodec
 import org.bson.codecs.DocumentCodecProvider
 import org.bson.codecs.ValueCodecProvider
+import org.bson.conversions.Bson
 import spock.lang.Specification
 
 import static com.mongodb.CustomMatchers.isTheSameAs
@@ -58,7 +59,7 @@ class FindIterableSpecification extends Specification {
                 it[0].onResult(null, null)
             }
         }
-        def executor = new TestOperationExecutor([cursor, cursor])
+        def executor = new TestOperationExecutor([cursor, cursor, cursor])
         def findIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
                 new Document('filter', 1))
                 .sort(new Document('sort', 1))
@@ -166,6 +167,26 @@ class FindIterableSpecification extends Specification {
                 .showRecordId(true)
                 .snapshot(true)
         )
+
+        when: 'passing nulls to nullable methods'
+        new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern, executor,
+                new Document('filter', 1))
+                .filter(null as Bson)
+                .collation(null)
+                .modifiers(null)
+                .projection(null)
+                .sort(null as Bson)
+                .comment(null)
+                .hint(null)
+                .max(null as Bson)
+                .min(null as Bson)
+                .into([]) { result, t -> }
+
+        operation = executor.getReadOperation() as FindOperation<Document>
+
+        then: 'should set an empty doc for the filter'
+        expect operation, isTheSameAs(new FindOperation<Document>(namespace, new DocumentCodec())
+                .filter(new BsonDocument()).slaveOk(true))
     }
 
     def 'should handle mixed types'() {

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

@@ -138,7 +138,7 @@ <TResult> FindOperation<TResult> find(final MongoNamespace findNamespace, final
     private <TResult> FindOperation<TResult> createFindOperation(final MongoNamespace findNamespace, final Bson filter,
                                                                  final Class<TResult> resultClass, final FindOptions options) {
         return new FindOperation<TResult>(findNamespace, codecRegistry.get(resultClass))
-                .filter(filter.toBsonDocument(documentClass, codecRegistry))
+                .filter(filter == null ? new BsonDocument() : filter.toBsonDocument(documentClass, codecRegistry))
                 .batchSize(options.getBatchSize())
                 .skip(options.getSkip())
                 .limit(options.getLimit())

driver-sync/src/test/unit/com/mongodb/client/internal/FindIterableSpecification.groovy

@@ -32,6 +32,7 @@ import org.bson.codecs.BsonValueCodecProvider
 import org.bson.codecs.DocumentCodec
 import org.bson.codecs.DocumentCodecProvider
 import org.bson.codecs.ValueCodecProvider
+import org.bson.conversions.Bson
 import spock.lang.Specification
 
 import static com.mongodb.CustomMatchers.isTheSameAs
@@ -53,7 +54,7 @@ class FindIterableSpecification extends Specification {
     @SuppressWarnings('deprecation')
     def 'should build the expected findOperation'() {
         given:
-        def executor = new TestOperationExecutor([null, null])
+        def executor = new TestOperationExecutor([null, null, null])
         def findIterable = new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
                 executor, new Document('filter', 1))
                 .sort(new Document('sort', 1))
@@ -161,6 +162,26 @@ class FindIterableSpecification extends Specification {
                 .showRecordId(true)
                 .snapshot(true)
         )
+
+        when: 'passing nulls to nullable methods'
+        new FindIterableImpl(null, namespace, Document, Document, codecRegistry, readPreference, readConcern,
+                executor, new Document('filter', 1))
+                .filter(null as Bson)
+                .collation(null)
+                .modifiers(null)
+                .projection(null)
+                .sort(null as Bson)
+                .comment(null)
+                .hint(null)
+                .max(null as Bson)
+                .min(null as Bson)
+                .iterator()
+
+        operation = executor.getReadOperation() as FindOperation<Document>
+
+        then: 'should set an empty doc for the filter'
+        expect operation, isTheSameAs(new FindOperation<Document>(namespace, new DocumentCodec())
+                .filter(new BsonDocument()).slaveOk(true))
     }
 
     def 'should use ClientSession'() {