Mapped server error codes

Also plumbed in the init and fini methods.

JAVA-2806

Code review updates and added bonus - server error code translation

Author: rozza

build.gradle

@@ -164,6 +164,7 @@ configure(subprojects.findAll { it.name != 'util' && it.name != 'mongo-java-driv
 
         systemProperties(
                 'org.mongodb.test.uri': System.getProperty('org.mongodb.test.uri'),
+                'org.mongodb.test.embedded.path': System.getProperty('org.mongodb.test.embedded.path'),
                 'org.mongodb.useSocket': System.getProperty('org.mongodb.useSocket', 'false'),
                 'org.mongodb.disableAsync': System.getProperty('org.mongodb.disableAsync', 'false'),
                 'org.mongodb.async.type': System.getProperty('org.mongodb.async.type', 'nio2'),

driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedConnection.java

@@ -16,7 +16,6 @@
 
 package com.mongodb.embedded.client;
 
-import com.mongodb.MongoException;
 import com.sun.jna.Pointer;
 import com.sun.jna.ptr.IntByReference;
 import com.sun.jna.ptr.PointerByReference;
@@ -26,44 +25,24 @@
 import java.util.List;
 
 final class EmbeddedConnection implements Closeable {
-
-    private final MongoDBCAPI mongoDBCAPI;
     private volatile Pointer clientPointer;
 
-    EmbeddedConnection(final MongoDBCAPI mongoDBCAPI, final Pointer databasePointer) {
-        this.mongoDBCAPI = mongoDBCAPI;
-        try {
-            this.clientPointer = mongoDBCAPI.libmongodbcapi_db_client_new(databasePointer);
-        } catch (Throwable t) {
-            throw new MongoException("Error from embedded server when calling db_client_new: " + t.getMessage(), t);
-        }
+    EmbeddedConnection(final Pointer databasePointer) {
+        this.clientPointer = MongoDBCAPIHelper.db_client_new(databasePointer);
     }
 
     public ByteBuffer sendAndReceive(final List<ByteBuffer> messageBufferList) {
         byte[] message = createCompleteMessage(messageBufferList);
 
         PointerByReference outputBufferReference = new PointerByReference();
         IntByReference outputSize = new IntByReference();
-
-        try {
-            int errorCode = mongoDBCAPI.libmongodbcapi_db_client_wire_protocol_rpc(clientPointer, message, message.length,
-                    outputBufferReference, outputSize);
-            if (errorCode != 0) {
-                throw new MongoException(errorCode, "Error from embedded server: " + errorCode);
-            }
-            return outputBufferReference.getValue().getByteBuffer(0, outputSize.getValue());
-        } catch (Throwable t) {
-            throw new MongoException("Error from embedded server when calling db_client_wire_protocol_rpc: " + t.getMessage(), t);
-        }
+        MongoDBCAPIHelper.db_client_wire_protocol_rpc(clientPointer, message, message.length, outputBufferReference, outputSize);
+        return outputBufferReference.getValue().getByteBuffer(0, outputSize.getValue());
     }
 
     @Override
     public void close() {
-        try {
-            mongoDBCAPI.libmongodbcapi_db_client_destroy(clientPointer);
-        } catch (Throwable t) {
-            throw new MongoException("Error from embedded server when calling db_client_destroy: " + t.getMessage(), t);
-        }
+        MongoDBCAPIHelper.db_client_destroy(clientPointer);
         clientPointer = null;
     }
 

driver-embedded/src/main/com/mongodb/embedded/client/EmbeddedDatabase.java

@@ -16,12 +16,9 @@
 
 package com.mongodb.embedded.client;
 
-import com.mongodb.MongoClientException;
 import com.mongodb.MongoException;
 import com.mongodb.diagnostics.logging.Logger;
 import com.mongodb.diagnostics.logging.Loggers;
-import com.sun.jna.Native;
-import com.sun.jna.NativeLibrary;
 import com.sun.jna.Pointer;
 
 import java.io.Closeable;
@@ -32,8 +29,6 @@
 
 final class EmbeddedDatabase implements Closeable {
     private static final Logger LOGGER = Loggers.getLogger("embedded.client");
-    private static final String NATIVE_LIBRARY_NAME = "mongo_embedded_capi";
-    private final MongoDBCAPI mongoDBCAPI;
     private volatile Pointer databasePointer;
 
     EmbeddedDatabase(final MongoClientSettings mongoClientSettings) {
@@ -46,55 +41,22 @@ final class EmbeddedDatabase implements Closeable {
             throw new MongoException(format("Could not validate / create the dbpath: %s", mongoClientSettings.getDbPath()));
         }
 
-        if (mongoClientSettings.getLibraryPath() != null) {
-            NativeLibrary.addSearchPath(NATIVE_LIBRARY_NAME, mongoClientSettings.getLibraryPath());
-        }
-        try {
-            this.mongoDBCAPI = Native.loadLibrary(NATIVE_LIBRARY_NAME, MongoDBCAPI.class);
-        } catch (UnsatisfiedLinkError e) {
-            throw new MongoClientException(format("Failed to load the mongodb library: '%s'."
-                    + "%n %s %n"
-                    + "%n Please set the library location by either:"
-                    + "%n - Adding it to the classpath."
-                    + "%n - Setting 'jna.library.path' system property"
-                    + "%n - Configuring it in the 'MongoClientSettings.builder().libraryPath' method."
-                    + "%n", NATIVE_LIBRARY_NAME, e.getMessage()), e);
-        }
-
         String[] cmdArgs = createCmdArgs(mongoClientSettings);
-        try {
-            this.databasePointer = mongoDBCAPI.libmongodbcapi_db_new(cmdArgs.length, cmdArgs, createEnvArgs());
-            if (databasePointer == null) {
-                throw new MongoException("Could not create a new embedded database");
-            }
-        } catch (Throwable t) {
-            throw new MongoException("Error from embedded server when calling db_new: " + t.getMessage(), t);
-        }
+        this.databasePointer = MongoDBCAPIHelper.db_new(cmdArgs.length, cmdArgs, createEnvArgs());
     }
 
     public EmbeddedConnection createConnection() {
-        return new EmbeddedConnection(mongoDBCAPI, databasePointer);
+        return new EmbeddedConnection(databasePointer);
     }
 
     public void pump() {
-        try {
-            int errorCode = mongoDBCAPI.libmongodbcapi_db_pump(databasePointer);
-            if (errorCode != 0) {
-                throw new MongoException(errorCode, "Error from embedded server: + " + errorCode);
-            }
-        } catch (Throwable t) {
-            throw new MongoException("Error from embedded server when calling db_pump: " + t.getMessage(), t);
-        }
+        MongoDBCAPIHelper.db_pump(databasePointer);
     }
 
     @Override
     public void close() {
         if (databasePointer != null) {
-            try {
-                mongoDBCAPI.libmongodbcapi_db_destroy(databasePointer);
-            } catch (Throwable t) {
-                throw new MongoException("Error from embedded server when calling db_destroy: " + t.getMessage(), t);
-            }
+            MongoDBCAPIHelper.db_destroy(databasePointer);
             databasePointer = null;
         }
     }

driver-embedded/src/main/com/mongodb/embedded/client/MongoClientSettings.java

@@ -44,7 +44,6 @@ public final class MongoClientSettings {
 
     private final com.mongodb.MongoClientSettings wrappedMongoClientSettings;
     private final String dbPath;
-    private final String libraryPath;
 
     /**
      * Gets the default codec registry.  It includes the following providers:
@@ -94,7 +93,6 @@ public static Builder builder(final MongoClientSettings settings) {
     public static final class Builder {
         private com.mongodb.MongoClientSettings.Builder wrappedBuilder;
         private String dbPath;
-        private String libraryPath;
 
         private Builder() {
             wrappedBuilder = com.mongodb.MongoClientSettings.builder();
@@ -104,7 +102,6 @@ private Builder(final MongoClientSettings settings) {
             notNull("settings", settings);
             wrappedBuilder = com.mongodb.MongoClientSettings.builder(settings.wrappedMongoClientSettings);
             dbPath = settings.dbPath;
-            libraryPath = settings.libraryPath;
         }
 
         /**
@@ -187,17 +184,6 @@ public Builder dbPath(final String dbPath) {
             return this;
         }
 
-        /**
-         * Sets the library path for mongod.
-         *
-         * @param libraryPath the library path for mongod
-         * @return this
-         */
-        public Builder libraryPath(final String libraryPath) {
-            this.libraryPath = libraryPath;
-            return this;
-        }
-
         /**
          * Build an instance of {@code MongoClientSettings}.
          *
@@ -249,15 +235,6 @@ public String getDbPath() {
         return dbPath;
     }
 
-    /**
-     * Gets the library path for the embedded mongod
-     *
-     * @return the library path if set or null
-     */
-    public String getLibraryPath() {
-        return libraryPath;
-    }
-
     /**
      * Returns the wrapped MongoClientSettings instance
      *
@@ -270,7 +247,6 @@ public com.mongodb.MongoClientSettings getWrappedMongoClientSettings() {
     private MongoClientSettings(final Builder builder) {
         isTrue("dbPath is set", builder.dbPath != null && !builder.dbPath.isEmpty());
         dbPath = builder.dbPath;
-        libraryPath = builder.libraryPath;
         wrappedMongoClientSettings = builder.wrappedBuilder.build();
     }
 }

driver-embedded/src/main/com/mongodb/embedded/client/MongoClients.java

@@ -35,6 +35,8 @@ public final class MongoClients {
      * @param mongoEmbeddedSettings the settings for the embedded driver.
      */
     public static void init(final MongoEmbeddedSettings mongoEmbeddedSettings) {
+        // TODO - support yaml
+        MongoDBCAPIHelper.init(mongoEmbeddedSettings, "");
     }
 
     /**
@@ -44,6 +46,7 @@ public static void init(final MongoEmbeddedSettings mongoEmbeddedSettings) {
      * @return the client
      */
     public static MongoClient create(final MongoClientSettings mongoClientSettings) {
+        MongoDBCAPIHelper.checkHasBeenInitialized();
         Cluster cluster = new EmbeddedCluster(mongoClientSettings);
         return new MongoClientImpl(cluster, mongoClientSettings.getWrappedMongoClientSettings(), null);
     }
@@ -52,6 +55,7 @@ public static MongoClient create(final MongoClientSettings mongoClientSettings)
      * Closes down the mongod library
      */
     public static void close() {
+        MongoDBCAPIHelper.fini();
     }
 
     private MongoClients() {

driver-embedded/src/main/com/mongodb/embedded/client/MongoDBCAPI.java

@@ -26,6 +26,25 @@ interface MongoDBCAPI extends Library {
 
     // CHECKSTYLE.OFF: MethodName
 
+    /**
+     * Initializes the mongodbcapi library, required before any other call. Cannot be called again
+     * without libmongodbcapi_fini() being called first.
+     *
+     * @param config the YAML formatted MongoDB configuration string. See documentation for valid options.
+     *
+     * @note This function is not thread safe.
+     *
+     * @return the error, or 0 if success
+     */
+    int libmongodbcapi_init(String config);
+
+    /**
+     * Tears down the state of the library, all databases must be closed before calling this.
+     *
+     * @return the error, or 0 if success
+     */
+    int libmongodbcapi_fini();
+
     /**
      * Create a new db instance.
      *