Allow updateOne and replaceOne to supply sort option

driver-core/src/main/com/mongodb/client/model/ReplaceOptions.java

@@ -37,6 +37,7 @@ public class ReplaceOptions {
     private String hintString;
     private BsonValue comment;
     private Bson variables;
+    private Bson sort;
 
     /**
      * Returns true if a new document should be inserted if there are no matches to the query filter.  The default is false.
@@ -221,6 +222,33 @@ public ReplaceOptions let(final Bson variables) {
         return this;
     }
 
+    /**
+     * Gets the sort criteria to apply to the query. The default is null, which means that the documents will be returned in an undefined
+     * order.
+     *
+     * @return a document describing the sort criteria
+     * @since 5.3
+     * @mongodb.driver.manual reference/method/db.collection.replaceOne/ Sort
+     */
+    @Nullable
+    public Bson getSort() {
+        return sort;
+    }
+
+    /**
+     * Sets the sort criteria to apply to the query. When multiple documents match the query, the sort order specifies the document to be
+     * updated first.
+     *
+     * @param sort the sort criteria, which may be null.
+     * @return this
+     * @since 5.3
+     * @mongodb.driver.manual reference/method/db.collection.replaceOne/ Sort
+     */
+    public ReplaceOptions sort(@Nullable final Bson sort) {
+        this.sort = sort;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "ReplaceOptions{"
@@ -231,6 +259,7 @@ public String toString() {
                 + ", hintString=" + hintString
                 + ", comment=" + comment
                 + ", let=" + variables
+                + ", sort=" + sort
                 + '}';
     }
 }

driver-core/src/main/com/mongodb/client/model/UpdateOptions.java

@@ -40,6 +40,7 @@ public class UpdateOptions {
     private String hintString;
     private BsonValue comment;
     private Bson variables;
+    private Bson sort;
 
     /**
      * Returns true if a new document should be inserted if there are no matches to the query filter.  The default is false.
@@ -256,6 +257,35 @@ public UpdateOptions let(final Bson variables) {
         return this;
     }
 
+    /**
+     * Gets the sort criteria to apply to the query. The default is null, which means that the documents will be returned in an undefined
+     * order.
+     *
+     * @return a document describing the sort criteria
+     * @since 5.3
+     * @mongodb.driver.manual reference/method/db.collection.updateOne/ Sort
+     */
+    @Nullable
+    public Bson getSort() {
+        return sort;
+    }
+
+    /**
+     * Sets the sort criteria to apply to the query. When multiple documents match the query, the sort order specifies the document to be
+     * updated first.
+     *
+     * <p>Note: The sort is not applicable to updateMany.</p>
+     *
+     * @param sort the sort criteria, which may be null.
+     * @return this
+     * @since 5.3
+     * @mongodb.driver.manual reference/method/db.collection.updateOne/ Sort
+     */
+    public UpdateOptions sort(@Nullable final Bson sort) {
+        this.sort = sort;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "UpdateOptions{"
@@ -267,6 +297,7 @@ public String toString() {
                 + ", hintString=" + hintString
                 + ", comment=" + comment
                 + ", let=" + variables
+                + ", sort=" + sort
                 + '}';
     }
 }

driver-core/src/main/com/mongodb/internal/bulk/UpdateRequest.java

@@ -40,6 +40,7 @@ public final class UpdateRequest extends WriteRequest {
     private List<BsonDocument> arrayFilters;
     @Nullable private BsonDocument hint;
     @Nullable private String hintString;
+    @Nullable private BsonDocument sort;
 
     public UpdateRequest(final BsonDocument filter, @Nullable final BsonValue update, final Type updateType) {
         if (updateType != Type.UPDATE && updateType != Type.REPLACE) {
@@ -128,5 +129,15 @@ public UpdateRequest hintString(@Nullable final String hint) {
         this.hintString = hint;
         return this;
     }
+
+    @Nullable
+    public BsonDocument getSort() {
+        return sort;
+    }
+
+    public UpdateRequest sort(@Nullable final BsonDocument sort) {
+        this.sort = sort;
+        return this;
+    }
 }
 

driver-core/src/main/com/mongodb/internal/connection/SplittablePayload.java

@@ -270,6 +270,11 @@ public void encode(final BsonWriter writer, final WriteRequestWithIndex writeReq
                 } else if (update.getHintString() != null) {
                     writer.writeString("hint", update.getHintString());
                 }
+                if (update.getSort() != null) {
+                    writer.writeName("sort");
+                    getCodec(assertNotNull(update.getSort())).encode(writer, assertNotNull(update.getSort()),
+                            EncoderContext.builder().build());
+                }
                 writer.writeEndDocument();
             } else {
                 DeleteRequest deleteRequest = (DeleteRequest) writeRequestWithIndex.getWriteRequest();

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

@@ -85,6 +85,7 @@ public class MixedBulkWriteOperation implements AsyncWriteOperation<BulkWriteRes
     private Boolean bypassDocumentValidation;
     private BsonValue comment;
     private BsonDocument variables;
+    private BsonDocument sort;
 
     public MixedBulkWriteOperation(final MongoNamespace namespace, final List<? extends WriteRequest> writeRequests,
             final boolean ordered, final WriteConcern writeConcern, final boolean retryWrites) {
@@ -130,6 +131,15 @@ public MixedBulkWriteOperation comment(@Nullable final BsonValue comment) {
         return this;
     }
 
+    public BsonDocument getSort() {
+        return sort;
+    }
+
+    public MixedBulkWriteOperation sort(@Nullable final BsonDocument sort) {
+        this.sort = sort;
+        return this;
+    }
+
     public MixedBulkWriteOperation let(@Nullable final BsonDocument variables) {
         this.variables = variables;
         return this;

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

@@ -464,7 +464,8 @@ MixedBulkWriteOperation bulkWrite(final List<? extends WriteModel<? extends TDoc
                         .upsert(replaceOneModel.getReplaceOptions().isUpsert())
                         .collation(replaceOneModel.getReplaceOptions().getCollation())
                         .hint(toBsonDocument(replaceOneModel.getReplaceOptions().getHint()))
-                        .hintString(replaceOneModel.getReplaceOptions().getHintString());
+                        .hintString(replaceOneModel.getReplaceOptions().getHintString())
+                        .sort(toBsonDocument(replaceOneModel.getReplaceOptions().getSort()));
             } else if (writeModel instanceof UpdateOneModel) {
                 UpdateOneModel<TDocument> updateOneModel = (UpdateOneModel<TDocument>) writeModel;
                 BsonValue update = updateOneModel.getUpdate() != null ? toBsonDocument(updateOneModel.getUpdate())
@@ -475,7 +476,8 @@ MixedBulkWriteOperation bulkWrite(final List<? extends WriteModel<? extends TDoc
                         .collation(updateOneModel.getOptions().getCollation())
                         .arrayFilters(toBsonDocumentList(updateOneModel.getOptions().getArrayFilters()))
                         .hint(toBsonDocument(updateOneModel.getOptions().getHint()))
-                        .hintString(updateOneModel.getOptions().getHintString());
+                        .hintString(updateOneModel.getOptions().getHintString())
+                        .sort(toBsonDocument(updateOneModel.getOptions().getSort()));
             } else if (writeModel instanceof UpdateManyModel) {
                 UpdateManyModel<TDocument> updateManyModel = (UpdateManyModel<TDocument>) writeModel;
                 BsonValue update = updateManyModel.getUpdate() != null ? toBsonDocument(updateManyModel.getUpdate())

driver-legacy/src/main/com/mongodb/ReplaceRequest.java

@@ -18,6 +18,8 @@
 
 import com.mongodb.client.model.Collation;
 import com.mongodb.internal.bulk.UpdateRequest;
+import com.mongodb.lang.Nullable;
+import org.bson.BsonDocument;
 import org.bson.BsonDocumentWrapper;
 import org.bson.codecs.Encoder;
 
@@ -28,6 +30,7 @@ class ReplaceRequest extends WriteRequest {
     private final Encoder<DBObject> codec;
     private final Encoder<DBObject> replacementCodec;
     private final Collation collation;
+    @Nullable private BsonDocument sort;
 
     ReplaceRequest(final DBObject query, final DBObject document, final boolean upsert, final Encoder<DBObject> codec,
                           final Encoder<DBObject> replacementCodec, final Collation collation) {
@@ -55,12 +58,23 @@ public Collation getCollation() {
         return collation;
     }
 
+    @Nullable
+    public BsonDocument getSort() {
+        return sort;
+    }
+
+    public ReplaceRequest sort(@Nullable final BsonDocument sort) {
+        this.sort = sort;
+        return this;
+    }
+
     @Override
     com.mongodb.internal.bulk.WriteRequest toNew(final DBCollection dbCollection) {
         return new UpdateRequest(new BsonDocumentWrapper<>(query, codec),
                 new BsonDocumentWrapper<>(document, replacementCodec),
                                                        com.mongodb.internal.bulk.WriteRequest.Type.REPLACE)
-               .upsert(isUpsert())
-               .collation(getCollation());
+                .upsert(isUpsert())
+                .collation(getCollation())
+                .sort(getSort());
     }
 }

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedCrudHelper.java

@@ -1159,6 +1159,9 @@ private UpdateOptions getUpdateOptions(final BsonDocument arguments) {
                 case "collation":
                     options.collation(asCollation(cur.getValue().asDocument()));
                     break;
+                case "sort":
+                    options.sort(cur.getValue().asDocument());
+                    break;
                 default:
                     throw new UnsupportedOperationException("Unsupported argument: " + cur.getKey());
             }
@@ -1193,6 +1196,9 @@ private ReplaceOptions getReplaceOptions(final BsonDocument arguments) {
                 case "collation":
                     options.collation(asCollation(cur.getValue().asDocument()));
                     break;
+                case "sort":
+                    options.sort(cur.getValue().asDocument());
+                    break;
                 default:
                     throw new UnsupportedOperationException("Unsupported argument: " + cur.getKey());
             }

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java

@@ -135,15 +135,6 @@ public static void doSkips(final TestDef def) {
                 .test("crud", "findOneAndUpdate-hint-unacknowledged", "Unacknowledged findOneAndUpdate with hint document on 4.4+ server")
                 .test("crud", "findOneAndDelete-hint-unacknowledged", "Unacknowledged findOneAndDelete with hint string on 4.4+ server")
                 .test("crud", "findOneAndDelete-hint-unacknowledged", "Unacknowledged findOneAndDelete with hint document on 4.4+ server");
-        def.skipJira("https://jira.mongodb.org/browse/JAVA-5622")
-                .test("crud", "updateOne-sort", "UpdateOne with sort option")
-                .test("crud", "updateOne-sort", "updateOne with sort option unsupported (server-side error)")
-                .test("crud", "replaceOne-sort", "ReplaceOne with sort option")
-                .test("crud", "replaceOne-sort", "replaceOne with sort option unsupported (server-side error)")
-                .test("crud", "BulkWrite updateOne-sort", "BulkWrite updateOne with sort option")
-                .test("crud", "BulkWrite updateOne-sort", "BulkWrite updateOne with sort option unsupported (server-side error)")
-                .test("crud", "BulkWrite replaceOne-sort", "BulkWrite replaceOne with sort option")
-                .test("crud", "BulkWrite replaceOne-sort", "BulkWrite replaceOne with sort option unsupported (server-side error)");
 
         // gridfs