Normalize single write handling of Write Concern errors

JAVA-6111

Author: rozza

driver-core/src/main/com/mongodb/MongoServerException.java

@@ -71,6 +71,21 @@ public MongoServerException(final int code, @Nullable final String errorCodeName
         this.serverAddress = serverAddress;
     }
 
+    /**
+     * Construct a new instance.
+     *
+     * @param code the error code from the server
+     * @param message the message from the server
+     * @param t the throwable cause
+     * @param serverAddress the address of the server
+     * @since 5.7
+     */
+    public MongoServerException(final int code, final String message, final Throwable t, final ServerAddress serverAddress) {
+        super(code, message, t);
+        this.errorCodeName = null;
+        this.serverAddress = serverAddress;
+    }
+
     /**
      * Gets the address of the server.
      *

driver-core/src/main/com/mongodb/MongoWriteConcernException.java

@@ -82,6 +82,24 @@ public MongoWriteConcernException(final WriteConcernError writeConcernError, @Nu
         addLabels(errorLabels);
     }
 
+    /**
+     * Construct an instance.
+     *
+     * @param writeConcernError the non-null write concern error
+     * @param writeConcernResult the write result
+     * @param serverAddress the non-null server address
+     * @param errorLabels the server errorLabels
+     * @param t the throwable cause
+     * @since 5.7
+     */
+    public MongoWriteConcernException(final WriteConcernError writeConcernError, @Nullable final WriteConcernResult writeConcernResult,
+            final ServerAddress serverAddress, final Collection<String> errorLabels, final Throwable t) {
+        super(writeConcernError.getCode(), writeConcernError.getMessage(), t, serverAddress);
+        this.writeConcernResult = writeConcernResult;
+        this.writeConcernError = notNull("writeConcernError", writeConcernError);
+        addLabels(errorLabels);
+    }
+
 
     /**
      * Gets the write concern error.

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

@@ -19,6 +19,7 @@
 import com.mongodb.MongoBulkWriteException;
 import com.mongodb.MongoClientException;
 import com.mongodb.MongoException;
+import com.mongodb.MongoInternalException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.MongoWriteConcernException;
 import com.mongodb.MongoWriteException;
@@ -534,20 +535,8 @@ private Mono<BulkWriteResult> createSingleWriteRequestMono(
                     MongoException exception;
                     WriteConcernError writeConcernError = e.getWriteConcernError();
                     if (e.getWriteErrors().isEmpty() && writeConcernError != null) {
-                        WriteConcernResult writeConcernResult;
-                        if (type == WriteRequest.Type.INSERT) {
-                            writeConcernResult = WriteConcernResult.acknowledged(e.getWriteResult().getInsertedCount(), false, null);
-                        } else if (type == WriteRequest.Type.DELETE) {
-                            writeConcernResult = WriteConcernResult.acknowledged(e.getWriteResult().getDeletedCount(), false, null);
-                        } else {
-                            writeConcernResult = WriteConcernResult
-                                    .acknowledged(e.getWriteResult().getMatchedCount() + e.getWriteResult().getUpserts().size(),
-                                                  e.getWriteResult().getMatchedCount() > 0,
-                                                  e.getWriteResult().getUpserts().isEmpty()
-                                                          ? null : e.getWriteResult().getUpserts().get(0).getId());
-                        }
-                        exception = new MongoWriteConcernException(writeConcernError, writeConcernResult, e.getServerAddress(),
-                                e.getErrorLabels());
+                        exception = new MongoWriteConcernException(writeConcernError, translateBulkWriteResult(type, e.getWriteResult()),
+                                e.getServerAddress(), e.getErrorLabels(), e);
                     } else if (!e.getWriteErrors().isEmpty()) {
                         exception = new MongoWriteException(new WriteError(e.getWriteErrors().get(0)), e.getServerAddress(),
                                 e.getErrorLabels());
@@ -560,6 +549,23 @@ private Mono<BulkWriteResult> createSingleWriteRequestMono(
                 });
     }
 
+    private WriteConcernResult translateBulkWriteResult(final WriteRequest.Type type, final BulkWriteResult writeResult) {
+        switch (type) {
+            case INSERT:
+                return WriteConcernResult.acknowledged(writeResult.getInsertedCount(), false, null);
+            case DELETE:
+                return WriteConcernResult.acknowledged(writeResult.getDeletedCount(), false, null);
+            case UPDATE:
+            case REPLACE:
+                return WriteConcernResult.acknowledged(writeResult.getMatchedCount() + writeResult.getUpserts().size(),
+                        writeResult.getMatchedCount() > 0,
+                        writeResult.getUpserts().isEmpty()
+                                ? null : writeResult.getUpserts().get(0).getId());
+            default:
+                throw new MongoInternalException("Unhandled write request type: " + type);
+        }
+    }
+
     private OperationExecutor getExecutor(final TimeoutSettings timeoutSettings) {
         return executor.withTimeoutSettings(timeoutSettings);
     }

driver-sync/src/main/com/mongodb/client/internal/MongoCollectionImpl.java

@@ -1113,17 +1113,17 @@ private BulkWriteResult executeSingleWriteRequest(@Nullable final ClientSession
                                                       final WriteOperation<BulkWriteResult> writeOperation,
                                                       final WriteRequest.Type type) {
         try {
-            return getExecutor(timeoutSettings)
-                    .execute(writeOperation, readConcern, clientSession);
+            return getExecutor(timeoutSettings).execute(writeOperation, readConcern, clientSession);
         } catch (MongoBulkWriteException e) {
-            if (e.getWriteErrors().isEmpty()) {
-                throw new MongoWriteConcernException(e.getWriteConcernError(),
-                        translateBulkWriteResult(type, e.getWriteResult()),
-                        e.getServerAddress(), e.getErrorLabels());
-            } else {
+            if (e.getWriteConcernError() != null) {
+                throw new MongoWriteConcernException(e.getWriteConcernError(), translateBulkWriteResult(type, e.getWriteResult()),
+                        e.getServerAddress(), e.getErrorLabels(), e);
+            } else if (!e.getWriteErrors().isEmpty()) {
                 throw new MongoWriteException(new WriteError(e.getWriteErrors().get(0)), e.getServerAddress(), e.getErrorLabels());
+            } else {
+                throw new MongoWriteException(new WriteError(-1, "Unknown write error", new BsonDocument()),
+                        e.getServerAddress(), e.getErrorLabels());
             }
-
         }
     }