Raise error when hint option is provided on unacknowledged

writes against any server version

JAVA-3705

Author: jstewart148

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

@@ -16,7 +16,6 @@
 
 package com.mongodb.internal.operation;
 
-import com.mongodb.MongoClientException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.model.Collation;
@@ -39,7 +38,7 @@
 import static com.mongodb.internal.operation.DocumentHelper.putIfNotNull;
 import static com.mongodb.internal.operation.DocumentHelper.putIfNotZero;
 import static com.mongodb.internal.operation.OperationHelper.validateCollation;
-import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionFourDotTwo;
+import static com.mongodb.internal.operation.OperationHelper.validateHint;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
@@ -278,9 +277,7 @@ private BsonDocument createCommand(final SessionContext sessionContext, final Se
             commandDocument.put("collation", collation.asDocument());
         }
         if (hint != null || hintString != null) {
-            if (serverIsLessThanVersionFourDotTwo(connectionDescription)) {
-                throw new MongoClientException("Specifying a value for the hint option requires a minimum MongoDB version of 4.2");
-            }
+            validateHint(connectionDescription, getWriteConcern());
             if (hint != null) {
                 commandDocument.put("hint", hint.toBsonDocument(BsonDocument.class, null));
             } else {

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

@@ -16,7 +16,6 @@
 
 package com.mongodb.internal.operation;
 
-import com.mongodb.MongoClientException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.model.Collation;
@@ -44,8 +43,8 @@
 import static com.mongodb.internal.operation.DocumentHelper.putIfNotZero;
 import static com.mongodb.internal.operation.DocumentHelper.putIfTrue;
 import static com.mongodb.internal.operation.OperationHelper.validateCollation;
+import static com.mongodb.internal.operation.OperationHelper.validateHint;
 import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
-import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionFourDotTwo;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
@@ -379,9 +378,7 @@ private BsonDocument createCommand(final SessionContext sessionContext, final Se
             commandDocument.put("collation", collation.asDocument());
         }
         if (hint != null || hintString != null) {
-            if (serverIsLessThanVersionFourDotTwo(connectionDescription)) {
-                throw new MongoClientException("Specifying a value for the hint option requires a minimum MongoDB version of 4.2");
-            }
+            validateHint(connectionDescription, getWriteConcern());
             if (hint != null) {
                 commandDocument.put("hint", hint.toBsonDocument(BsonDocument.class, null));
             } else {

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

@@ -16,7 +16,6 @@
 
 package com.mongodb.internal.operation;
 
-import com.mongodb.MongoClientException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.model.Collation;
@@ -46,8 +45,8 @@
 import static com.mongodb.internal.operation.DocumentHelper.putIfNotZero;
 import static com.mongodb.internal.operation.DocumentHelper.putIfTrue;
 import static com.mongodb.internal.operation.OperationHelper.validateCollation;
+import static com.mongodb.internal.operation.OperationHelper.validateHint;
 import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
-import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionFourDotTwo;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 /**
@@ -453,9 +452,7 @@ private BsonDocument createCommand(final SessionContext sessionContext, final Se
             commandDocument.put("arrayFilters", new BsonArray(arrayFilters));
         }
         if (hint != null || hintString != null) {
-            if (serverIsLessThanVersionFourDotTwo(connectionDescription)) {
-                throw new MongoClientException("Specifying a value for the hint option requires a minimum MongoDB version of 4.2");
-            }
+            validateHint(connectionDescription, getWriteConcern());
             if (hint != null) {
                 commandDocument.put("hint", hint.toBsonDocument(BsonDocument.class, null));
             } else {

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

@@ -57,7 +57,6 @@
 import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
 import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotFour;
 import static com.mongodb.internal.operation.ServerVersionHelper.serverIsAtLeastVersionThreeDotTwo;
-import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionFourDotFour;
 import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionFourDotTwo;
 import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionThreeDotFour;
 import static com.mongodb.internal.operation.ServerVersionHelper.serverIsLessThanVersionThreeDotSix;
@@ -153,21 +152,22 @@ private static void validateArrayFilters(final ConnectionDescription connectionD
         }
     }
 
-    private static void validateHint(final ConnectionDescription connectionDescription, final WriteConcern writeConcern,
-                                     final WriteRequest request) {
+    private static void validateWriteRequestHint(final ConnectionDescription connectionDescription, final WriteConcern writeConcern,
+                                                 final WriteRequest request) {
         if (serverIsLessThanVersionThreeDotFour(connectionDescription)) {
             throw new IllegalArgumentException(format("Hint not supported by wire version: %s",
                     connectionDescription.getMaxWireVersion()));
+        } else if ((request instanceof DeleteRequest || request instanceof UpdateRequest) && !writeConcern.isAcknowledged()) {
+            throw new MongoClientException("Specifying hints with an unacknowledged WriteConcern is not supported");
+        }
+    }
+
+    static void validateHint(final ConnectionDescription connectionDescription, final WriteConcern writeConcern) {
+        if (serverIsLessThanVersionFourDotTwo(connectionDescription)) {
+            throw new IllegalArgumentException(format("Hint not supported by wire version: %s",
+                    connectionDescription.getMaxWireVersion()));
         } else if (!writeConcern.isAcknowledged()) {
-            if (serverIsLessThanVersionFourDotTwo(connectionDescription)) {
-                throw new MongoClientException(
-                        format("Specifying hints with an unacknowledged WriteConcern is not supported by wire version: %s",
-                                connectionDescription.getMaxWireVersion()));
-            } else if (request instanceof DeleteRequest && serverIsLessThanVersionFourDotFour(connectionDescription)) {
-                throw new MongoClientException(
-                    format("Specifying hints with an unacknowledged WriteConcern in a delete request is not supported by wire version: %s",
-                            connectionDescription.getMaxWireVersion()));
-            }
+            throw new MongoClientException("Specifying hints with an unacknowledged WriteConcern is not supported");
         }
     }
 
@@ -234,7 +234,7 @@ static void validateWriteRequestHints(final ConnectionDescription connectionDesc
                 hintString = ((DeleteRequest) request).getHintString();
             }
             if (hint != null || hintString != null) {
-                validateHint(connectionDescription, writeConcern, request);
+                validateWriteRequestHint(connectionDescription, writeConcern, request);
                 break;
             }
         }

driver-core/src/test/resources/crud/v2/bulkWrite-delete-hint.json

@@ -2,7 +2,7 @@
   "runOn": [
     {
       "minServerVersion": "4.2.0",
-      "maxServerVersion": "4.2.99"
+      "maxServerVersion": "4.3.0"
     }
   ],
   "data": [

driver-core/src/test/resources/crud/v2/findOneAndReplace-hint-serverError.json

@@ -2,7 +2,7 @@
   "runOn": [
     {
       "minServerVersion": "4.2.0",
-      "maxServerVersion": "4.2.99"
+      "maxServerVersion": "4.3.0"
     }
   ],
   "data": [

driver-core/src/test/resources/crud/v2/findOneAndUpdate-hint-serverError.json

@@ -1,9 +1,4 @@
 {
-  "runOn": [
-    {
-      "maxServerVersion": "4.3.3"
-    }
-  ],
   "data": [
     {
       "_id": 1,
@@ -25,7 +20,7 @@
   "collection_name": "BulkWrite_delete_hint",
   "tests": [
     {
-      "description": "Unacknowledged bulkWrite deleteOne with hints fails with client-side error on server < 4.4",
+      "description": "Unacknowledged bulkWrite deleteOne with hints fails with client-side error",
       "operations": [
         {
           "name": "bulkWrite",
@@ -89,7 +84,7 @@
       }
     },
     {
-      "description": "Unacknowledged bulkWrite deleteMany with hints fails with client-side error on server < 4.4",
+      "description": "Unacknowledged bulkWrite deleteMany with hints fails with client-side error",
       "operations": [
         {
           "name": "bulkWrite",