Add errorCodeName property to MongoServerException

Also, ensure that MongoQueryException pushes the property down through the constructor

JAVA-4565

Author: jyemin

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

@@ -46,7 +46,7 @@ public class MongoCommandException extends MongoServerException {
      * @param address the address of the server that generated the response
      */
     public MongoCommandException(final BsonDocument response, final ServerAddress address) {
-        super(extractErrorCode(response),
+        super(extractErrorCode(response), extractErrorCodeName(response),
               format("Command failed with error %s: '%s' on server %s. The full response is %s", extractErrorCodeAndName(response),
                      extractErrorMessage(response), address, getResponseAsJson(response)), address);
         this.response = response;
@@ -70,7 +70,7 @@ public int getErrorCode() {
      * @mongodb.server.release 3.4
      */
     public String getErrorCodeName() {
-        return extractErrorCodeName(response);
+        return super.getErrorCodeName();
     }
 
     /**

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

@@ -16,6 +16,8 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
+
 import static java.lang.String.format;
 
 /**
@@ -41,14 +43,33 @@ public MongoQueryException(final ServerAddress address, final int errorCode, fin
         this.errorMessage = errorMessage;
     }
 
+    /**
+     * Construct an instance.
+     *
+     * @param address the server address
+     * @param errorCode the error code
+     * @param errorCodeName the error code name
+     * @param errorMessage the error message
+     * @since 4.6
+     */
+    public MongoQueryException(final ServerAddress address, final int errorCode, final @Nullable String errorCodeName,
+            final String errorMessage) {
+        super(errorCode, errorCodeName,
+                format("Query failed with error code %d with name '%s' and error message '%s' on server %s", errorCode, errorCodeName,
+                        errorMessage, address),
+                address);
+        this.errorMessage = errorMessage;
+    }
+
     /**
      * Construct an instance from a command exception.
      *
      * @param commandException the command exception
      * @since 3.7
      */
     public MongoQueryException(final MongoCommandException commandException) {
-        this(commandException.getServerAddress(), commandException.getErrorCode(), commandException.getErrorMessage());
+        this(commandException.getServerAddress(), commandException.getErrorCode(), commandException.getErrorCodeName(),
+                commandException.getErrorMessage());
         addLabels(commandException.getErrorLabels());
     }
 

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

@@ -16,6 +16,8 @@
 
 package com.mongodb;
 
+import com.mongodb.lang.Nullable;
+
 /**
  * An exception indicating that some error has been raised by a MongoDB server in response to an operation.
  *
@@ -24,6 +26,8 @@
  */
 public abstract class MongoServerException extends MongoException {
     private static final long serialVersionUID = -5213859742051776206L;
+    @Nullable
+    private final String errorCodeName;
     private final ServerAddress serverAddress;
 
     /**
@@ -35,6 +39,7 @@ public abstract class MongoServerException extends MongoException {
     public MongoServerException(final String message, final ServerAddress serverAddress) {
         super(message);
         this.serverAddress = serverAddress;
+        this.errorCodeName = null;
     }
 
     /**
@@ -47,6 +52,23 @@ public MongoServerException(final String message, final ServerAddress serverAddr
     public MongoServerException(final int code, final String message, final ServerAddress serverAddress) {
         super(code, message);
         this.serverAddress = serverAddress;
+        this.errorCodeName = null;
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param code the error code from the server
+     * @param errorCodeName the error code name from the server
+     * @param message the message from the server
+     * @param serverAddress the address of the server
+     * @since 4.6
+     */
+    public MongoServerException(final int code, final @Nullable String errorCodeName, final String message,
+            final ServerAddress serverAddress) {
+        super(code, message);
+        this.errorCodeName = errorCodeName;
+        this.serverAddress = serverAddress;
     }
 
     /**
@@ -57,4 +79,16 @@ public MongoServerException(final int code, final String message, final ServerAd
     public ServerAddress getServerAddress() {
         return serverAddress;
     }
+
+    /**
+     * Get the error code name, which may be null
+     *
+     * @return the error code nam
+     * @mongodb.server.release 3.4
+     * @since 4.6
+     */
+    @Nullable
+    public String getErrorCodeName() {
+        return errorCodeName;
+    }
 }