CXX-1053 Alphabetize options::create_collection members/methods

Author: jrassi

src/mongocxx/options/create_collection.cpp

@@ -24,18 +24,18 @@ namespace mongocxx {
 MONGOCXX_INLINE_NAMESPACE_BEGIN
 namespace options {
 
-create_collection& create_collection::capped(bool capped) {
-    _capped = capped;
+create_collection& create_collection::auto_index_id(bool auto_index_id) {
+    _auto_index_id = auto_index_id;
     return *this;
 }
 
-create_collection& create_collection::auto_index_id(bool auto_index_id) {
-    _auto_index_id = auto_index_id;
+create_collection& create_collection::capped(bool capped) {
+    _capped = capped;
     return *this;
 }
 
-create_collection& create_collection::size(int max_size) {
-    _max_size = max_size;
+create_collection& create_collection::collation(bsoncxx::document::view_or_value collation) {
+    _collation = std::move(collation);
     return *this;
 }
 
@@ -44,19 +44,19 @@ create_collection& create_collection::max(int max_documents) {
     return *this;
 }
 
-create_collection& create_collection::collation(bsoncxx::document::view_or_value collation) {
-    _collation = std::move(collation);
+create_collection& create_collection::no_padding(bool no_padding) {
+    _no_padding = no_padding;
     return *this;
 }
 
-create_collection& create_collection::storage_engine(
-    bsoncxx::document::view_or_value storage_engine_opts) {
-    _storage_engine_opts = std::move(storage_engine_opts);
+create_collection& create_collection::size(int max_size) {
+    _max_size = max_size;
     return *this;
 }
 
-create_collection& create_collection::no_padding(bool no_padding) {
-    _no_padding = no_padding;
+create_collection& create_collection::storage_engine(
+    bsoncxx::document::view_or_value storage_engine_opts) {
+    _storage_engine_opts = std::move(storage_engine_opts);
     return *this;
 }
 
@@ -65,69 +65,69 @@ create_collection& create_collection::validation_criteria(class validation_crite
     return *this;
 }
 
-const stdx::optional<bool>& create_collection::capped() const {
-    return _capped;
-}
-
 const stdx::optional<bool>& create_collection::auto_index_id() const {
     return _auto_index_id;
 }
 
-const stdx::optional<int>& create_collection::size() const {
-    return _max_size;
-}
-
-const stdx::optional<int>& create_collection::max() const {
-    return _max_documents;
+const stdx::optional<bool>& create_collection::capped() const {
+    return _capped;
 }
 
 const stdx::optional<bsoncxx::document::view_or_value>& create_collection::collation() const {
     return _collation;
 }
 
-const stdx::optional<bsoncxx::document::view_or_value>& create_collection::storage_engine() const {
-    return _storage_engine_opts;
+const stdx::optional<int>& create_collection::max() const {
+    return _max_documents;
 }
 
 const stdx::optional<bool>& create_collection::no_padding() const {
     return _no_padding;
 }
 
+const stdx::optional<int>& create_collection::size() const {
+    return _max_size;
+}
+
+const stdx::optional<bsoncxx::document::view_or_value>& create_collection::storage_engine() const {
+    return _storage_engine_opts;
+}
+
 const stdx::optional<class validation_criteria>& create_collection::validation_criteria() const {
     return _validation;
 }
 
 bsoncxx::document::value create_collection::to_document() const {
     auto doc = bsoncxx::builder::stream::document{};
 
-    if (_capped) {
-        doc << "capped" << *_capped;
-    }
-
     if (_auto_index_id) {
         doc << "autoIndexId" << *_auto_index_id;
     }
 
-    if (_max_size) {
-        doc << "size" << *_max_size;
-    }
-
-    if (_max_documents) {
-        doc << "max" << *_max_documents;
+    if (_capped) {
+        doc << "capped" << *_capped;
     }
 
     if (_collation) {
         doc << "collation" << bsoncxx::types::b_document{*_collation};
     }
 
-    if (_storage_engine_opts) {
-        doc << "storageEngine" << bsoncxx::types::b_document{*_storage_engine_opts};
+    if (_max_documents) {
+        doc << "max" << *_max_documents;
+    }
+
+    if (_max_size) {
+        doc << "size" << *_max_size;
     }
 
     if (_no_padding) {
         doc << "flags" << (*_no_padding ? 0x10 : 0x00);
     }
 
+    if (_storage_engine_opts) {
+        doc << "storageEngine" << bsoncxx::types::b_document{*_storage_engine_opts};
+    }
+
     if (_validation) {
         doc << bsoncxx::builder::stream::concatenate(_validation->to_document());
     }

src/mongocxx/options/create_collection.hpp

@@ -30,6 +30,24 @@ namespace options {
 ///
 class MONGOCXX_API create_collection {
    public:
+    ///
+    /// Specify false to disable the automatic creation of an index on the _id field.
+    ///
+    /// @note For replica sets, all collections must have autoIndexId set to true.
+    ///
+    /// @param auto_index_id
+    ///   Whether or not this collection will automatically generate an index on _id.
+    ///
+    create_collection& auto_index_id(bool auto_index_id);
+
+    ///
+    /// Gets the current auto_index_id setting.
+    ///
+    /// @return
+    ///   Whether or not this collection will automatically generate an index on _id.
+    ///
+    const stdx::optional<bool>& auto_index_id() const;
+
     ///
     /// To create a capped collection, specify true.
     ///
@@ -53,43 +71,26 @@ class MONGOCXX_API create_collection {
     const stdx::optional<bool>& capped() const;
 
     ///
-    /// Specify false to disable the automatic creation of an index on the _id field.
+    /// Sets the default collation for this collection.
     ///
-    /// @note For replica sets, all collections must have autoIndexId set to true.
+    /// @param collation
+    ///   The default collation for the collection.
     ///
-    /// @param auto_index_id
-    ///   Whether or not this collection will automatically generate an index on _id.
+    /// @see
+    ///   https://docs.mongodb.com/master/reference/collation/
     ///
-    create_collection& auto_index_id(bool auto_index_id);
+    create_collection& collation(bsoncxx::document::view_or_value collation);
 
     ///
-    /// Gets the current auto_index_id setting.
+    /// Gets the default collation for this collection.
     ///
     /// @return
-    ///   Whether or not this collection will automatically generate an index on _id.
-    ///
-    const stdx::optional<bool>& auto_index_id() const;
-
-    ///
-    /// A maximum size, in bytes, for a capped collection.
-    ///
-    /// @note Once a capped collection reaches its maximum size, MongoDB removes older
-    ///   documents to make space for new documents.
-    ///
-    /// @note Size is required for capped collections and ignored for other collections.
-    ///
-    /// @param max_size
-    ///   Maximum size, in bytes, of this collection (if capped).
-    ///
-    create_collection& size(int max_size);
-
-    ///
-    /// Gets the current size setting, for a capped collection.
+    ///   The default collation for the collection.
     ///
-    /// @return
-    ///   Maximum size, in bytes, of this collection (if capped).
+    /// @see
+    ///   https://docs.mongodb.com/master/reference/collation/
     ///
-    const stdx::optional<int>& size() const;
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
 
     ///
     /// The maximum number of documents allowed in the capped collection.
@@ -113,64 +114,63 @@ class MONGOCXX_API create_collection {
     const stdx::optional<int>& max() const;
 
     ///
-    /// Sets the default collation for this collection.
+    /// When true, disables the power of 2 sizes allocation for the collection.
     ///
-    /// @param collation
-    ///   The default collation for the collection.
+    /// @see https://docs.mongodb.org/manual/reference/method/db.createCollection/
     ///
-    /// @see
-    ///   https://docs.mongodb.com/master/reference/collation/
+    /// @param no_padding
+    ///   When true, disables power of 2 sizing for this collection.
     ///
-    create_collection& collation(bsoncxx::document::view_or_value collation);
+    create_collection& no_padding(bool no_padding);
 
     ///
-    /// Gets the default collation for this collection.
+    /// Gets the current value of the "no padding" option for the collection.
     ///
-    /// @return
-    ///   The default collation for the collection.
+    /// @see https://docs.mongodb.org/manual/reference/method/db.createCollection/
     ///
-    /// @see
-    ///   https://docs.mongodb.com/master/reference/collation/
+    /// @return
+    ///   When true, power of 2 sizing is disabled for this collection.
     ///
-    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+    const stdx::optional<bool>& no_padding() const;
 
     ///
-    /// Specify configuration to the storage on a per-collection basis.
+    /// A maximum size, in bytes, for a capped collection.
     ///
-    /// @note This option is currently only available with the WiredTiger storage engine.
+    /// @note Once a capped collection reaches its maximum size, MongoDB removes older
+    ///   documents to make space for new documents.
     ///
-    /// @param storage_engine_options
-    ///   Configuration options specific to the storage engine.
+    /// @note Size is required for capped collections and ignored for other collections.
     ///
-    create_collection& storage_engine(bsoncxx::document::view_or_value storage_engine_opts);
+    /// @param max_size
+    ///   Maximum size, in bytes, of this collection (if capped).
+    ///
+    create_collection& size(int max_size);
 
     ///
-    /// Gets the current storage engine configuration for this collection.
+    /// Gets the current size setting, for a capped collection.
     ///
     /// @return
-    ///   Configuration options specific to the storage engine.
+    ///   Maximum size, in bytes, of this collection (if capped).
     ///
-    const stdx::optional<bsoncxx::document::view_or_value>& storage_engine() const;
+    const stdx::optional<int>& size() const;
 
     ///
-    /// When true, disables the power of 2 sizes allocation for the collection.
+    /// Specify configuration to the storage on a per-collection basis.
     ///
-    /// @see https://docs.mongodb.org/manual/reference/method/db.createCollection/
+    /// @note This option is currently only available with the WiredTiger storage engine.
     ///
-    /// @param no_padding
-    ///   When true, disables power of 2 sizing for this collection.
+    /// @param storage_engine_options
+    ///   Configuration options specific to the storage engine.
     ///
-    create_collection& no_padding(bool no_padding);
+    create_collection& storage_engine(bsoncxx::document::view_or_value storage_engine_opts);
 
     ///
-    /// Gets the current value of the "no padding" option for the collection.
-    ///
-    /// @see https://docs.mongodb.org/manual/reference/method/db.createCollection/
+    /// Gets the current storage engine configuration for this collection.
     ///
     /// @return
-    ///   When true, power of 2 sizing is disabled for this collection.
+    ///   Configuration options specific to the storage engine.
     ///
-    const stdx::optional<bool>& no_padding() const;
+    const stdx::optional<bsoncxx::document::view_or_value>& storage_engine() const;
 
     ///
     /// Specify validation criteria for this collection.
@@ -211,13 +211,13 @@ class MONGOCXX_API create_collection {
     MONGOCXX_INLINE operator bsoncxx::document::value() const;
 
    private:
-    stdx::optional<bool> _capped;
     stdx::optional<bool> _auto_index_id;
-    stdx::optional<int> _max_size;
-    stdx::optional<int> _max_documents;
+    stdx::optional<bool> _capped;
     stdx::optional<bsoncxx::document::view_or_value> _collation;
-    stdx::optional<bsoncxx::document::view_or_value> _storage_engine_opts;
+    stdx::optional<int> _max_documents;
+    stdx::optional<int> _max_size;
     stdx::optional<bool> _no_padding;
+    stdx::optional<bsoncxx::document::view_or_value> _storage_engine_opts;
     stdx::optional<class validation_criteria> _validation;
 };