Avoid including default or null values in mapReduceCommand

* No longer sending null values for the query, sort, finalize, and scope fields
* No longer sending false values for the sharded and nonAtomic fields of the out sub-document

JAVA-3555

Author: jyemin

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

@@ -44,6 +44,7 @@
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
 import static com.mongodb.internal.operation.CommandOperationHelper.executeCommand;
 import static com.mongodb.internal.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.internal.operation.DocumentHelper.putIfNotNull;
 import static com.mongodb.internal.operation.DocumentHelper.putIfNotZero;
 import static com.mongodb.internal.operation.DocumentHelper.putIfTrue;
 import static com.mongodb.internal.operation.OperationHelper.AsyncCallableWithConnection;
@@ -594,20 +595,21 @@ public MapReduceStatistics apply(final BsonDocument result, final AsyncConnectio
 
     private BsonDocument getCommand(final ConnectionDescription description) {
         BsonDocument outputDocument = new BsonDocument(getAction(), new BsonString(getCollectionName()));
-        outputDocument.append("sharded", BsonBoolean.valueOf(isSharded()));
-        outputDocument.append("nonAtomic", BsonBoolean.valueOf(isNonAtomic()));
+        putIfTrue(outputDocument, "sharded", isSharded());
+        putIfTrue(outputDocument, "nonAtomic", isNonAtomic());
         if (getDatabaseName() != null) {
             outputDocument.put("db", new BsonString(getDatabaseName()));
         }
         BsonDocument commandDocument = new BsonDocument("mapreduce", new BsonString(namespace.getCollectionName()))
                                            .append("map", getMapFunction())
                                            .append("reduce", getReduceFunction())
-                                           .append("out", outputDocument)
-                                           .append("query", asValueOrNull(getFilter()))
-                                           .append("sort", asValueOrNull(getSort()))
-                                           .append("finalize", asValueOrNull(getFinalizeFunction()))
-                                           .append("scope", asValueOrNull(getScope()))
-                                           .append("verbose", BsonBoolean.valueOf(isVerbose()));
+                                           .append("out", outputDocument);
+
+        putIfNotNull(commandDocument, "query", getFilter());
+        putIfNotNull(commandDocument, "sort", getSort());
+        putIfNotNull(commandDocument, "finalize", getFinalizeFunction());
+        putIfNotNull(commandDocument, "scope", getScope());
+        putIfTrue(commandDocument, "verbose", isVerbose());
         putIfNotZero(commandDocument, "limit", getLimit());
         putIfNotZero(commandDocument, "maxTimeMS", getMaxTime(MILLISECONDS));
         putIfTrue(commandDocument, "jsMode", isJsMode());

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

@@ -18,10 +18,10 @@
 
 import com.mongodb.ExplainVerbosity;
 import com.mongodb.MongoNamespace;
-import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.client.model.Collation;
 import com.mongodb.connection.ConnectionDescription;
 import com.mongodb.connection.ServerDescription;
+import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncConnectionSource;
 import com.mongodb.internal.binding.AsyncReadBinding;
 import com.mongodb.internal.binding.ConnectionSource;
@@ -33,7 +33,6 @@
 import com.mongodb.internal.operation.CommandOperationHelper.CommandReadTransformer;
 import com.mongodb.internal.operation.CommandOperationHelper.CommandReadTransformerAsync;
 import com.mongodb.internal.session.SessionContext;
-import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 import org.bson.BsonJavaScript;
@@ -50,6 +49,7 @@
 import static com.mongodb.internal.operation.CommandOperationHelper.CommandCreator;
 import static com.mongodb.internal.operation.CommandOperationHelper.executeCommand;
 import static com.mongodb.internal.operation.CommandOperationHelper.executeCommandAsync;
+import static com.mongodb.internal.operation.DocumentHelper.putIfNotNull;
 import static com.mongodb.internal.operation.DocumentHelper.putIfNotZero;
 import static com.mongodb.internal.operation.DocumentHelper.putIfTrue;
 import static com.mongodb.internal.operation.ExplainHelper.asExplainCommand;
@@ -429,13 +429,13 @@ private BsonDocument getCommand(final SessionContext sessionContext) {
         BsonDocument commandDocument = new BsonDocument("mapreduce", new BsonString(namespace.getCollectionName()))
                                            .append("map", getMapFunction())
                                            .append("reduce", getReduceFunction())
-                                           .append("out", new BsonDocument("inline", new BsonInt32(1)))
-                                           .append("query", asValueOrNull(getFilter()))
-                                           .append("sort", asValueOrNull(getSort()))
-                                           .append("finalize", asValueOrNull(getFinalizeFunction()))
-                                           .append("scope", asValueOrNull(getScope()))
-                                           .append("verbose", BsonBoolean.valueOf(isVerbose()));
+                                           .append("out", new BsonDocument("inline", new BsonInt32(1)));
 
+        putIfNotNull(commandDocument, "query", getFilter());
+        putIfNotNull(commandDocument, "sort", getSort());
+        putIfNotNull(commandDocument, "finalize", getFinalizeFunction());
+        putIfNotNull(commandDocument, "scope", getScope());
+        putIfTrue(commandDocument, "verbose", isVerbose());
         appendReadConcernToCommand(sessionContext, commandDocument);
         putIfNotZero(commandDocument, "limit", getLimit());
         putIfNotZero(commandDocument, "maxTimeMS", getMaxTime(MILLISECONDS));

driver-core/src/test/functional/com/mongodb/internal/operation/MapReduceToCollectionOperationSpecification.groovy

@@ -30,7 +30,6 @@ import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonInt64
 import org.bson.BsonJavaScript
-import org.bson.BsonNull
 import org.bson.BsonString
 import org.bson.Document
 import org.bson.codecs.DocumentCodec
@@ -233,12 +232,7 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
         def expectedCommand = new BsonDocument('mapreduce', new BsonString(getCollectionName()))
                 .append('map', mapF)
                 .append('reduce', reduceF)
-                .append('out', BsonDocument.parse('{replace: "outCollection", sharded: false, nonAtomic: false}'))
-                .append('query', BsonNull.VALUE)
-                .append('sort', BsonNull.VALUE)
-                .append('finalize', BsonNull.VALUE)
-                .append('scope', BsonNull.VALUE)
-                .append('verbose', BsonBoolean.FALSE)
+                .append('out', BsonDocument.parse('{replace: "outCollection"}'))
 
         if (includeWriteConcern) {
             expectedCommand.append('writeConcern', WriteConcern.MAJORITY.asDocument())
@@ -260,7 +254,7 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
                 .bypassDocumentValidation(true)
                 .verbose(true)
 
-        expectedCommand.append('out', BsonDocument.parse('{merge: "outCollection", sharded: false, nonAtomic: false, db: "dbName"}'))
+        expectedCommand.append('out', BsonDocument.parse('{merge: "outCollection", db: "dbName"}'))
                 .append('query', filter)
                 .append('sort', sort)
                 .append('finalize', finalizeF)

driver-core/src/test/functional/com/mongodb/internal/operation/MapReduceWithInlineResultsOperationSpecification.groovy

@@ -38,7 +38,6 @@ import org.bson.BsonDocument
 import org.bson.BsonInt32
 import org.bson.BsonInt64
 import org.bson.BsonJavaScript
-import org.bson.BsonNull
 import org.bson.BsonString
 import org.bson.BsonTimestamp
 import org.bson.Document
@@ -157,11 +156,6 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
             .append('map', operation.getMapFunction())
             .append('reduce', operation.getReduceFunction())
             .append('out', new BsonDocument('inline', new BsonInt32(1)))
-            .append('query', new BsonNull())
-            .append('sort', new BsonNull())
-            .append('finalize', new BsonNull())
-            .append('scope', new BsonNull())
-            .append('verbose', BsonBoolean.FALSE)
 
         then:
         testOperation(operation, serverVersion, expectedCommand, async, helper.commandResult)
@@ -272,11 +266,6 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
               "map" : { "$code" : "function(){ }" },
               "reduce" : { "$code" : "function(key, values){ }" },
               "out" : { "inline" : 1 },
-              "query" : null,
-              "sort" : null,
-              "finalize" : null,
-              "scope" : null,
-              "verbose" : false,
               }''')
         appendReadConcernToCommand(sessionContext, commandDocument)
 
@@ -324,11 +313,6 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
               "map" : { "$code" : "function(){ }" },
               "reduce" : { "$code" : "function(key, values){ }" },
               "out" : { "inline" : 1 },
-              "query" : null,
-              "sort" : null,
-              "finalize" : null,
-              "scope" : null,
-              "verbose" : false,
               }''')
         appendReadConcernToCommand(sessionContext, commandDocument)