Remove deprecated mapReduce options

JAVA-5149

Author: jyemin

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

@@ -164,10 +164,9 @@ public AsyncWriteOperation<MapReduceStatistics> mapReduceToCollection(final Stri
             final long maxTimeMS, final boolean jsMode, final Bson scope,
             final Bson sort, final boolean verbose,
             final com.mongodb.client.model.MapReduceAction action,
-            final boolean nonAtomic, final boolean sharded,
             final Boolean bypassDocumentValidation, final Collation collation) {
         return operations.mapReduceToCollection(databaseName, collectionName, mapFunction, reduceFunction, finalizeFunction, filter, limit,
-                maxTimeMS, jsMode, scope, sort, verbose, action, nonAtomic, sharded, bypassDocumentValidation, collation);
+                maxTimeMS, jsMode, scope, sort, verbose, action, bypassDocumentValidation, collation);
     }
 
     public <TResult> AsyncReadOperation<MapReduceAsyncBatchCursor<TResult>> mapReduce(final String mapFunction, final String reduceFunction,

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

@@ -46,7 +46,6 @@
 import static com.mongodb.internal.operation.DocumentHelper.putIfNotZero;
 import static com.mongodb.internal.operation.DocumentHelper.putIfTrue;
 import static com.mongodb.internal.operation.OperationHelper.LOGGER;
-import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionFourDotFour;
 import static com.mongodb.internal.operation.SyncOperationHelper.CommandWriteTransformer;
 import static com.mongodb.internal.operation.SyncOperationHelper.executeCommand;
 import static com.mongodb.internal.operation.SyncOperationHelper.withConnection;
@@ -81,8 +80,6 @@
     private long maxTimeMS;
     private String action = "replace";
     private String databaseName;
-    private boolean sharded;
-    private boolean nonAtomic;
     private Boolean bypassDocumentValidation;
     private Collation collation;
     private static final List<String> VALID_ACTIONS = asList("replace", "merge", "reduce");
@@ -217,24 +214,6 @@ public MapReduceToCollectionOperation databaseName(@Nullable final String databa
         return this;
     }
 
-    public boolean isSharded() {
-        return sharded;
-    }
-
-    public MapReduceToCollectionOperation sharded(final boolean sharded) {
-        this.sharded = sharded;
-        return this;
-    }
-
-    public boolean isNonAtomic() {
-        return nonAtomic;
-    }
-
-    public MapReduceToCollectionOperation nonAtomic(final boolean nonAtomic) {
-        this.nonAtomic = nonAtomic;
-        return this;
-    }
-
     public Boolean getBypassDocumentValidation() {
         return bypassDocumentValidation;
     }
@@ -318,10 +297,6 @@ private CommandWriteTransformerAsync<BsonDocument, MapReduceStatistics> transfor
 
     private BsonDocument getCommand(@Nullable final ConnectionDescription description) {
         BsonDocument outputDocument = new BsonDocument(getAction(), new BsonString(getCollectionName()));
-        if (description != null && !serverIsAtLeastVersionFourDotFour(description)) {
-            putIfTrue(outputDocument, "sharded", isSharded());
-            putIfTrue(outputDocument, "nonAtomic", isNonAtomic());
-        }
         if (getDatabaseName() != null) {
             outputDocument.put("db", new BsonString(getDatabaseName()));
         }

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

@@ -269,7 +269,6 @@ MapReduceToCollectionOperation mapReduceToCollection(final String databaseName,
                                                                 final int limit, final long maxTimeMS, final boolean jsMode,
                                                                 final Bson scope, final Bson sort, final boolean verbose,
                                                                 final com.mongodb.client.model.MapReduceAction action,
-                                                                final boolean nonAtomic, final boolean sharded,
                                                                 final Boolean bypassDocumentValidation, final Collation collation) {
         MapReduceToCollectionOperation operation = new MapReduceToCollectionOperation(assertNotNull(namespace),
                 new BsonJavaScript(mapFunction), new BsonJavaScript(reduceFunction), collectionName, writeConcern)
@@ -281,8 +280,6 @@ MapReduceToCollectionOperation mapReduceToCollection(final String databaseName,
                 .sort(toBsonDocument(sort))
                 .verbose(verbose)
                 .action(action.getValue())
-                .nonAtomic(nonAtomic)
-                .sharded(sharded)
                 .databaseName(databaseName)
                 .bypassDocumentValidation(bypassDocumentValidation)
                 .collation(collation);

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

@@ -132,17 +132,15 @@ public ReadOperation<Void> aggregateToCollection(final List<? extends Bson> pipe
                 comment, variables, aggregationLevel);
     }
 
-    @SuppressWarnings("deprecation")
     public WriteOperation<MapReduceStatistics> mapReduceToCollection(final String databaseName, final String collectionName,
                                                                      final String mapFunction, final String reduceFunction,
                                                                      final String finalizeFunction, final Bson filter, final int limit,
                                                                      final long maxTimeMS, final boolean jsMode, final Bson scope,
                                                                      final Bson sort, final boolean verbose,
                                                                      final com.mongodb.client.model.MapReduceAction action,
-                                                                     final boolean nonAtomic, final boolean sharded,
                                                                      final Boolean bypassDocumentValidation, final Collation collation) {
         return operations.mapReduceToCollection(databaseName, collectionName, mapFunction, reduceFunction, finalizeFunction, filter, limit,
-                maxTimeMS, jsMode, scope, sort, verbose, action, nonAtomic, sharded, bypassDocumentValidation, collation);
+                maxTimeMS, jsMode, scope, sort, verbose, action, bypassDocumentValidation, collation);
     }
 
     public <TResult> ReadOperation<MapReduceBatchCursor<TResult>> mapReduce(final String mapFunction, final String reduceFunction,

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

@@ -94,8 +94,6 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
         operation.getCollation() == null
         !operation.isJsMode()
         !operation.isVerbose()
-        !operation.isSharded()
-        !operation.isNonAtomic()
     }
 
     def 'should set optional values correctly'(){

driver-kotlin-coroutine/src/integration/kotlin/com/mongodb/kotlin/client/coroutine/syncadapter/SyncMapReduceIterable.kt

@@ -51,10 +51,6 @@ data class SyncMapReduceIterable<T : Any>(val wrapped: MapReduceFlow<T>) :
     override fun databaseName(databaseName: String?): SyncMapReduceIterable<T> = apply {
         wrapped.databaseName(databaseName)
     }
-    @Suppress("OVERRIDE_DEPRECATION")
-    override fun sharded(sharded: Boolean): SyncMapReduceIterable<T> = apply { wrapped.sharded(sharded) }
-    @Suppress("OVERRIDE_DEPRECATION")
-    override fun nonAtomic(nonAtomic: Boolean): SyncMapReduceIterable<T> = apply { wrapped.nonAtomic(nonAtomic) }
 
     override fun bypassDocumentValidation(bypassDocumentValidation: Boolean?): SyncMapReduceIterable<T> = apply {
         wrapped.bypassDocumentValidation(bypassDocumentValidation)

driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MapReduceFlow.kt

@@ -165,28 +165,6 @@ public class MapReduceFlow<T : Any>(private val wrapped: MapReducePublisher<T>)
      */
     public fun databaseName(databaseName: String?): MapReduceFlow<T> = apply { wrapped.databaseName(databaseName) }
 
-    /**
-     * Sets if the output database is sharded
-     *
-     * @param sharded if the output database is sharded
-     * @return this
-     * @see
-     *   [output with an action](https://www.mongodb.com/docs/manual/reference/command/mapReduce/#output-to-a-collection-with-an-action)
-     */
-    public fun sharded(sharded: Boolean): MapReduceFlow<T> = apply { wrapped.sharded(sharded) }
-
-    /**
-     * Sets if the post-processing step will prevent MongoDB from locking the database.
-     *
-     * Valid only with the `MapReduceAction.MERGE` or `MapReduceAction.REDUCE` actions.
-     *
-     * @param nonAtomic if the post-processing step will prevent MongoDB from locking the database.
-     * @return this
-     * @see
-     *   [output with an action](https://www.mongodb.com/docs/manual/reference/command/mapReduce/#output-to-a-collection-with-an-action)
-     */
-    public fun nonAtomic(nonAtomic: Boolean): MapReduceFlow<T> = apply { wrapped.nonAtomic(nonAtomic) }
-
     /**
      * Sets the bypass document level validation flag.
      *

driver-kotlin-coroutine/src/test/kotlin/com/mongodb/kotlin/client/coroutine/MapReduceFlowTest.kt

@@ -67,9 +67,7 @@ class MapReduceFlowTest {
         flow.limit(1)
         flow.maxTime(1)
         flow.maxTime(1, TimeUnit.SECONDS)
-        flow.nonAtomic(true)
         flow.scope(bson)
-        flow.sharded(true)
         flow.sort(bson)
         flow.verbose(true)
         flow.action(MapReduceAction.MERGE)
@@ -85,9 +83,7 @@ class MapReduceFlowTest {
         verify(wrapped).limit(1)
         verify(wrapped).maxTime(1, TimeUnit.MILLISECONDS)
         verify(wrapped).maxTime(1, TimeUnit.SECONDS)
-        verify(wrapped).nonAtomic(true)
         verify(wrapped).scope(bson)
-        verify(wrapped).sharded(true)
         verify(wrapped).sort(bson)
         verify(wrapped).verbose(true)
         verify(wrapped).action(MapReduceAction.MERGE)

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MapReducePublisher.java

@@ -134,29 +134,6 @@ public interface MapReducePublisher<TResult> extends Publisher<TResult> {
      * @mongodb.driver.manual reference/command/mapReduce/#output-to-a-collection-with-an-action output with an action
      */
     MapReducePublisher<TResult> databaseName(@Nullable String databaseName);
-    /**
-     * Sets if the output database is sharded
-     *
-     * @param sharded if the output database is sharded
-     * @return this
-     * @mongodb.driver.manual reference/command/mapReduce/#output-to-a-collection-with-an-action output with an action
-     * @deprecated this option will no longer be supported in MongoDB 4.4
-     */
-    @Deprecated
-    MapReducePublisher<TResult> sharded(boolean sharded);
-
-    /**
-     * Sets if the post-processing step will prevent MongoDB from locking the database.
-     * <p>
-     * Valid only with the {@code MapReduceAction.MERGE} or {@code MapReduceAction.REDUCE} actions.
-     *
-     * @param nonAtomic if the post-processing step will prevent MongoDB from locking the database.
-     * @return this
-     * @mongodb.driver.manual reference/command/mapReduce/#output-to-a-collection-with-an-action output with an action
-     * @deprecated this option will no longer be supported in MongoDB 4.4 as it will no longer hold a global or database level write lock.
-     */
-    @Deprecated
-    MapReducePublisher<TResult> nonAtomic(boolean nonAtomic);
 
     /**
      * Sets the bypass document level validation flag.

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/MapReducePublisherImpl.java

@@ -57,8 +57,6 @@ final class MapReducePublisherImpl<T> extends BatchCursorPublisher<T> implements
     private long maxTimeMS;
     private com.mongodb.client.model.MapReduceAction action = com.mongodb.client.model.MapReduceAction.REPLACE;
     private String databaseName;
-    private boolean sharded;
-    private boolean nonAtomic;
     private Boolean bypassDocumentValidation;
     private Collation collation;
 
@@ -140,20 +138,6 @@ public com.mongodb.reactivestreams.client.MapReducePublisher<T> databaseName(@Nu
         return this;
     }
 
-    @Deprecated
-    @Override
-    public com.mongodb.reactivestreams.client.MapReducePublisher<T> sharded(final boolean sharded) {
-        this.sharded = sharded;
-        return this;
-    }
-
-    @Deprecated
-    @Override
-    public com.mongodb.reactivestreams.client.MapReducePublisher<T> nonAtomic(final boolean nonAtomic) {
-        this.nonAtomic = nonAtomic;
-        return this;
-    }
-
     @Override
     public com.mongodb.reactivestreams.client.MapReducePublisher<T> batchSize(final int batchSize) {
         super.batchSize(batchSize);
@@ -211,8 +195,7 @@ private WrappedMapReduceWriteOperation createMapReduceToCollectionOperation() {
         return new WrappedMapReduceWriteOperation(getOperations().mapReduceToCollection(databaseName, collectionName, mapFunction,
                                                                                         reduceFunction, finalizeFunction, filter, limit,
                                                                                         maxTimeMS, jsMode, scope, sort, verbose, action,
-                                                                                        nonAtomic, sharded,
-                                                                                        bypassDocumentValidation, collation));
+                bypassDocumentValidation, collation));
     }
 
     private AsyncReadOperation<AsyncBatchCursor<T>> createFindOperation(final int initialBatchSize) {