Reference the MongoDB embedded v1 ABI symbols

edaniels · rozza · commit 7894db00cd8f · 2018-06-05T11:39:53.000+01:00
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/MongoDBCAPI.java b/driver-embedded/src/main/com/mongodb/embedded/client/MongoDBCAPI.java
@@ -31,112 +31,112 @@ interface MongoDBCAPI extends Library {
      *
      * @return the status pointer from which to get an associated status code / error information.
      */
-    Pointer libmongodbcapi_status_create();
+    Pointer mongo_embedded_v1_status_create();
 
     /**
      * Destroys a valid status pointer object.
      *
-     * @param status the `libmongodbcapi_status` pointer to release.
+     * @param status the `mongo_embedded_v1_status` pointer to release.
      */
 
-    void libmongodbcapi_status_destroy(Pointer status);
+    void mongo_embedded_v1_status_destroy(Pointer status);
 
     /**
      * Gets an error code from a status pointer.
      *
-     * @param status the `libmongodbcapi_status` pointer from which to get an associated status code.
+     * @param status the `mongo_embedded_v1_status` pointer from which to get an associated status code.
      * @return The error code associated with the `status` parameter or 0 if successful.
      *
      */
-    int libmongodbcapi_status_get_error(Pointer status);
+    int mongo_embedded_v1_status_get_error(Pointer status);
 
     /**
      * Gets a descriptive error message from a status pointer.
      *
-     * @param status the `libmongodbcapi_status` pointer from which to get an associated error message.
+     * @param status the `mongo_embedded_v1_status` pointer from which to get an associated error message.
      *
      * @return A null-terminated string containing an error message.
      */
-    String libmongodbcapi_status_get_explanation(Pointer status);
+    String mongo_embedded_v1_status_get_explanation(Pointer status);
 
     /**
      * Gets a status code from a status pointer.
      *
-     * @param status the `libmongodbcapi_status` pointer from which to get an associated status code.
+     * @param status the `mongo_embedded_v1_status` pointer from which to get an associated status code.
      * @return A numeric status code associated with the `status` parameter which indicates a
      * sub-category of failure.
      */
-    int libmongodbcapi_status_get_code(Pointer status);
+    int mongo_embedded_v1_status_get_code(Pointer status);
 
     /**
      * Initializes the mongodbcapi library, required before any other call.
      *
-     * <p>Cannot be called again without {@link #libmongodbcapi_lib_fini(Pointer, Pointer)} being called first.</p>
+     * <p>Cannot be called again without {@link #mongo_embedded_v1_lib_fini(Pointer, Pointer)} being called first.</p>
      *
      * @param initParams the embedded mongod initialization parameters.
-     * @param status the `libmongodbcapi_status` pointer from which to get an associated status code.
+     * @param status the `mongo_embedded_v1_status` pointer from which to get an associated status code.
      * @return the lib pointer or null if there was a failure. Modifies the status on failure.
      */
-    Pointer libmongodbcapi_lib_init(Structure initParams, Pointer status);
+    Pointer mongo_embedded_v1_lib_init(Structure initParams, Pointer status);
 
     /**
      * Tears down the state of the library, all databases must be closed before calling this.
      *
-     * @param lib the `libmongodbcapi_lib` pointer
-     * @param status the `libmongodbcapi_status` pointer from which to get an associated status code.
+     * @param lib the `mongo_embedded_v1_lib` pointer
+     * @param status the `mongo_embedded_v1_status` pointer from which to get an associated status code.
      * @return the error code or 0 if successful. Modifies the status on failure.
      */
-    int libmongodbcapi_lib_fini(Pointer lib, Pointer status);
+    int mongo_embedded_v1_lib_fini(Pointer lib, Pointer status);
 
     /**
      * Creates an embedded MongoDB instance and returns a handle with the service context.
      *
-     * @param lib the `libmongodbcapi_lib` pointer
+     * @param lib the `mongo_embedded_v1_lib` pointer
      * @param yamlConfig null-terminated YAML formatted MongoDB configuration string
-     * @param status the `libmongodbcapi_status` pointer from which to get an associated status code.
+     * @param status the `mongo_embedded_v1_status` pointer from which to get an associated status code.
      * @return the instance pointer or null if there was a failure. Modifies the status on failure.
      */
-    Pointer libmongodbcapi_instance_create(Pointer lib, String yamlConfig, Pointer status);
+    Pointer mongo_embedded_v1_instance_create(Pointer lib, String yamlConfig, Pointer status);
 
     /**
      * Shuts down an embedded MongoDB instance.
      *
-     * @param instance the `libmongodbcapi_instance` pointer to be destroyed.
-     * @param status the `libmongodbcapi_status` pointer from which to get an associated status code.
+     * @param instance the `mongo_embedded_v1_instance` pointer to be destroyed.
+     * @param status the `mongo_embedded_v1_status` pointer from which to get an associated status code.
      * @return the error code or 0 if successful. Modifies the status on failure.
      */
-    int libmongodbcapi_instance_destroy(Pointer instance, Pointer status);
+    int mongo_embedded_v1_instance_destroy(Pointer instance, Pointer status);
 
     /**
      * Create a new embedded client instance.
      *
-     * @param instance the `libmongodbcapi_instance` pointer.
-     * @param status the `libmongodbcapi_status` pointer from which to get an associated status code.
+     * @param instance the `mongo_embedded_v1_instance` pointer.
+     * @param status the `mongo_embedded_v1_status` pointer from which to get an associated status code.
      * @return the client pointer or null if there was a failure. Modifies the status on failure.
      */
-    Pointer libmongodbcapi_client_create(Pointer instance, Pointer status);
+    Pointer mongo_embedded_v1_client_create(Pointer instance, Pointer status);
 
     /**
      * Destroys an embedded client instance.
      *
-     * @param client the `libmongodbcapi_client` pointer.
-     * @param status the `libmongodbcapi_status` pointer from which to get an associated status code.
+     * @param client the `mongo_embedded_v1_client` pointer.
+     * @param status the `mongo_embedded_v1_status` pointer from which to get an associated status code.
      * @return the error code or 0 if successful. Modifies the status on failure.
      */
-    int libmongodbcapi_client_destroy(Pointer client, Pointer status);
+    int mongo_embedded_v1_client_destroy(Pointer client, Pointer status);
 
     /**
      * Make an RPC call.  Not clear yet on whether this is the correct signature.
      *
-     * @param client     the `libmongodbcapi_client` pointer
+     * @param client     the `mongo_embedded_v1_client` pointer
      * @param input      the RPC input
      * @param inputSize  the RPC input size
      * @param output     the RPC output
      * @param outputSize the RPC output size
-     * @param status     status the `libmongodbcapi_status` pointer from which to get an associated status code.
+     * @param status     status the `mongo_embedded_v1_status` pointer from which to get an associated status code.
      * @return the error code or 0 if successful. Modifies the status on failure.
      */
-    int libmongodbcapi_client_invoke(Pointer client, byte[] input, int inputSize, PointerByReference output, IntByReference outputSize,
+    int mongo_embedded_v1_client_invoke(Pointer client, byte[] input, int inputSize, PointerByReference output, IntByReference outputSize,
                                      Pointer status);
 
 
diff --git a/driver-embedded/src/main/com/mongodb/embedded/client/MongoDBCAPIHelper.java b/driver-embedded/src/main/com/mongodb/embedded/client/MongoDBCAPIHelper.java
@@ -66,7 +66,7 @@ static synchronized void init(final MongoEmbeddedSettings mongoEmbeddedSettings)
                     + "%n", NATIVE_LIBRARY_NAME, e.getMessage()), e);
         }
         libraryStatusPointer = createStatusPointer();
-        libraryPointer = mongoDBCAPI.libmongodbcapi_lib_init(new MongoDBCAPIInitParams(mongoEmbeddedSettings), libraryStatusPointer);
+        libraryPointer = mongoDBCAPI.mongo_embedded_v1_lib_init(new MongoDBCAPIInitParams(mongoEmbeddedSettings), libraryStatusPointer);
         if (libraryPointer == null) {
             createErrorFromStatus(libraryStatusPointer);
         }
@@ -75,7 +75,7 @@ static synchronized void init(final MongoEmbeddedSettings mongoEmbeddedSettings)
     static synchronized void fini() {
         checkInitialized();
         try {
-            validateErrorCode(libraryStatusPointer, mongoDBCAPI.libmongodbcapi_lib_fini(libraryPointer, libraryStatusPointer));
+            validateErrorCode(libraryStatusPointer, mongoDBCAPI.mongo_embedded_v1_lib_fini(libraryPointer, libraryStatusPointer));
             libraryPointer = null;
         } catch (Throwable t) {
             throw createError("fini", t);
@@ -88,7 +88,7 @@ static synchronized void fini() {
     static Pointer instance_create(final String yamlConfig, final Pointer instanceStatusPointer) {
         checkInitialized();
         try {
-            return validatePointerCreated(instanceStatusPointer, mongoDBCAPI.libmongodbcapi_instance_create(libraryPointer, yamlConfig,
+            return validatePointerCreated(instanceStatusPointer, mongoDBCAPI.mongo_embedded_v1_instance_create(libraryPointer, yamlConfig,
                     instanceStatusPointer)
             );
         } catch (Throwable t) {
@@ -99,7 +99,7 @@ static Pointer instance_create(final String yamlConfig, final Pointer instanceSt
     static void instance_destroy(final Pointer instance, final Pointer instanceStatusPointer) {
         checkInitialized();
         try {
-            validateErrorCode(instanceStatusPointer, mongoDBCAPI.libmongodbcapi_instance_destroy(instance, instanceStatusPointer));
+            validateErrorCode(instanceStatusPointer, mongoDBCAPI.mongo_embedded_v1_instance_destroy(instance, instanceStatusPointer));
         } catch (Throwable t) {
             throw createError("instance_destroy", t);
         }
@@ -108,7 +108,7 @@ static void instance_destroy(final Pointer instance, final Pointer instanceStatu
     static Pointer create_client(final Pointer instance, final Pointer clientStatusPointer) {
         checkInitialized();
         try {
-            return validatePointerCreated(clientStatusPointer, mongoDBCAPI.libmongodbcapi_client_create(instance, clientStatusPointer));
+            return validatePointerCreated(clientStatusPointer, mongoDBCAPI.mongo_embedded_v1_client_create(instance, clientStatusPointer));
         } catch (Throwable t) {
             throw createError("client_create", t);
         }
@@ -117,7 +117,7 @@ static Pointer create_client(final Pointer instance, final Pointer clientStatusP
     static void client_destroy(final Pointer client, final Pointer clientStatusPointer) {
         checkInitialized();
         try {
-            validateErrorCode(clientStatusPointer, mongoDBCAPI.libmongodbcapi_client_destroy(client, clientStatusPointer));
+            validateErrorCode(clientStatusPointer, mongoDBCAPI.mongo_embedded_v1_client_destroy(client, clientStatusPointer));
         } catch (Throwable t) {
             throw createError("client_destroy", t);
         }
@@ -127,7 +127,7 @@ static void client_invoke(final Pointer client, final byte[] input, final Pointe
                               final Pointer clientStatusPointer) {
         checkInitialized();
         try {
-            validateErrorCode(clientStatusPointer, mongoDBCAPI.libmongodbcapi_client_invoke(client, input, input.length, output,
+            validateErrorCode(clientStatusPointer, mongoDBCAPI.mongo_embedded_v1_client_invoke(client, input, input.length, output,
                     outputSize, clientStatusPointer)
             );
         } catch (Throwable t) {
@@ -137,15 +137,15 @@ static void client_invoke(final Pointer client, final byte[] input, final Pointe
 
     static Pointer createStatusPointer() {
         try {
-            return mongoDBCAPI.libmongodbcapi_status_create();
+            return mongoDBCAPI.mongo_embedded_v1_status_create();
         } catch (Throwable t) {
             throw createError("status_create", t);
         }
     }
 
     static void destroyStatusPointer(final Pointer statusPointer) {
         try {
-            mongoDBCAPI.libmongodbcapi_status_destroy(statusPointer);
+            mongoDBCAPI.mongo_embedded_v1_status_destroy(statusPointer);
         } catch (Throwable t) {
             throw createError("status_destroy", t);
         }
@@ -159,13 +159,13 @@ private static MongoClientEmbeddedException createError(final String methodName,
     }
 
     private static void createErrorFromStatus(final Pointer statusPointer) {
-        createErrorFromStatus(statusPointer, mongoDBCAPI.libmongodbcapi_status_get_error(statusPointer));
+        createErrorFromStatus(statusPointer, mongoDBCAPI.mongo_embedded_v1_status_get_error(statusPointer));
     }
 
     private static void createErrorFromStatus(final Pointer statusPointer, final int errorCode) {
         throw new MongoClientEmbeddedException(errorCode,
-                mongoDBCAPI.libmongodbcapi_status_get_code(statusPointer),
-                mongoDBCAPI.libmongodbcapi_status_get_explanation(statusPointer));
+                mongoDBCAPI.mongo_embedded_v1_status_get_code(statusPointer),
+                mongoDBCAPI.mongo_embedded_v1_status_get_explanation(statusPointer));
     }
 
     private static Pointer validatePointerCreated(final Pointer statusPointer, final Pointer pointer) {
@@ -191,7 +191,7 @@ private MongoDBCAPIHelper() {
     }
 
     /**
-     * Represents libmongodbcapi_init_params
+     * Represents mongo_embedded_v1_init_params
      */
     public static class MongoDBCAPIInitParams extends Structure {
         // CHECKSTYLE.OFF: VisibilityModifier
