CDRIVER-3918 expose server api options as mongoc_optional_t

Author: samantharitter

src/libmongoc/CMakeLists.txt

@@ -597,6 +597,7 @@ set (HEADERS
    ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-macros.h
    ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-matcher.h
    ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-opcode.h
+   ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-optional.h
    ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-prelude.h
    ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-read-concern.h
    ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-read-prefs.h

src/libmongoc/src/mongoc/CMakeLists.txt

@@ -41,6 +41,7 @@ set (src_libmongoc_src_mongoc_DIST_hs
    mongoc-macros.h
    mongoc-matcher.h
    mongoc-opcode.h
+   mongoc-optional.h
    mongoc-prelude.h
    mongoc-rand.h
    mongoc-read-concern.h

src/libmongoc/src/mongoc/mongoc-optional.c

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2021 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-optional.h"
+
+void
+mongoc_optional_init (mongoc_optional_t *opt)
+{
+   opt->is_set = false;
+   opt->value = false;
+}
+
+bool
+mongoc_optional_set (mongoc_optional_t *opt)
+{
+   BSON_ASSERT (opt);
+   return opt->is_set;
+}
+
+bool
+mongoc_optional_value (mongoc_optional_t *opt)
+{
+   BSON_ASSERT (opt);
+   return opt->value;
+}
+
+void
+mongoc_optional_set_value (mongoc_optional_t *opt, bool val)
+{
+   BSON_ASSERT (opt);
+   opt->value = val;
+   opt->is_set = true;
+}
+
+void
+mongoc_optional_copy (const mongoc_optional_t *source, mongoc_optional_t *copy) {
+   copy->value = source->value;
+   copy->is_set = source->is_set;
+}

src/libmongoc/src/mongoc/mongoc-optional.h

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_OPTIONAL_H
+#define MONGOC_OPTIONAL_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+typedef struct {
+    bool value;
+    bool is_set;
+} mongoc_optional_t;
+
+MONGOC_EXPORT (void)
+mongoc_optional_init (mongoc_optional_t *opt);
+
+MONGOC_EXPORT (bool)
+mongoc_optional_set (mongoc_optional_t *opt);
+
+MONGOC_EXPORT (bool)
+mongoc_optional_value (mongoc_optional_t *opt);
+
+MONGOC_EXPORT (void)
+mongoc_optional_set_value (mongoc_optional_t *opt, bool val);
+
+MONGOC_EXPORT (void)
+mongoc_optional_copy (const mongoc_optional_t *source, mongoc_optional_t *copy);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_OPTIONAL_H */

src/libmongoc/src/mongoc/mongoc-server-api-private.h

@@ -23,10 +23,8 @@
 
 struct _mongoc_server_api_t {
    mongoc_server_api_version_t version;
-   bool strict;
-   bool strict_set;
-   bool deprecation_errors;
-   bool deprecation_errors_set;
+   mongoc_optional_t *strict;
+   mongoc_optional_t *deprecation_errors;
 };
 
 #endif /* MONGOC_SERVER_API_PRIVATE_H */

src/libmongoc/src/mongoc/mongoc-server-api.c

@@ -48,6 +48,8 @@ mongoc_server_api_new (mongoc_server_api_version_t version)
 
    api = (mongoc_server_api_t *) bson_malloc0 (sizeof (mongoc_server_api_t));
    api->version = version;
+   api->strict = mongoc_optional_new ();
+   api->deprecation_errors = mongoc_optional_new ();
 
    return api;
 }
@@ -63,10 +65,8 @@ mongoc_server_api_copy (const mongoc_server_api_t *api)
 
    copy = (mongoc_server_api_t *) bson_malloc0 (sizeof (mongoc_server_api_t));
    copy->version = api->version;
-   copy->strict_set = api->strict_set;
-   copy->strict = api->strict;
-   copy->deprecation_errors_set = api->deprecation_errors_set;
-   copy->deprecation_errors = api->deprecation_errors;
+   copy->strict = mongoc_optional_copy (api->strict);
+   copy->deprecation_errors = mongoc_optional_copy (api->deprecation_errors);
 
    return copy;
 }
@@ -85,15 +85,27 @@ void
 mongoc_server_api_strict (mongoc_server_api_t *api, bool strict)
 {
    BSON_ASSERT (api);
-   api->strict = strict;
-   api->strict_set = true;
+   mongoc_optional_set_value (api->strict, strict);
 }
 
 void
 mongoc_server_api_deprecation_errors (mongoc_server_api_t *api,
                                       bool deprecation_errors)
 {
    BSON_ASSERT (api);
-   api->deprecation_errors = deprecation_errors;
-   api->deprecation_errors_set = true;
+   mongoc_optional_set_value (api->deprecation_errors, deprecation_errors);
+}
+
+const mongoc_optional_t *
+mongoc_server_api_get_deprecation_errors (mongoc_server_api_t *api)
+{
+   BSON_ASSERT (api);
+   return api->deprecation_errors;
+}
+
+const mongoc_optional_t *
+mongo_server_api_get_strict (mongoc_server_api_t *api)
+{
+   BSON_ASSERT (api);
+   return api->strict;
 }

src/libmongoc/src/mongoc/mongoc-server-api.h

@@ -21,6 +21,7 @@
 
 #include <bson/bson.h>
 
+#include "mongoc-optional.h"
 #include "mongoc-macros.h"
 
 BSON_BEGIN_DECLS
@@ -52,6 +53,12 @@ MONGOC_EXPORT (void)
 mongoc_server_api_deprecation_errors (mongoc_server_api_t *api,
                                       bool deprecation_errors);
 
+MONGOC_EXPORT (const mongoc_optional_t *)
+mongoc_server_api_get_deprecation_errors (mongoc_server_api_t *api);
+
+MONGOC_EXPORT (const mongoc_optional_t *)
+mongo_server_api_get_strict (mongoc_server_api_t *api);
+
 BSON_END_DECLS
 
 #endif /* MONGOC_SERVER_API_H */