Skip to content

Commit 9154447

Browse files
authored
CXX-3235 use *_options suffix on more option classes (#1491)
* rename v1::encrypt -> v1::encrypt_options * rename v1::data_key -> v1::data_key_options * rename v1::range_key -> v1::range_options * rename v1::auto_encryption -> v1::auto_encryption_options
1 parent 8ac2a61 commit 9154447

13 files changed

+28
-28
lines changed

src/mongocxx/include/mongocxx/v1/range-fwd.hpp renamed to src/mongocxx/include/mongocxx/v1/auto_encryption_options-fwd.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace mongocxx {
2020
namespace v1 {
2121

22-
class range;
22+
class auto_encryption_options;
2323

2424
} // namespace v1
2525
} // namespace mongocxx
@@ -28,5 +28,5 @@ class range;
2828

2929
///
3030
/// @file
31-
/// Declares @ref mongocxx::v1::range.
31+
/// Declares @ref mongocxx::v1::auto_encryption_options.
3232
///

src/mongocxx/include/mongocxx/v1/auto_encryption.hpp renamed to src/mongocxx/include/mongocxx/v1/auto_encryption_options.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#pragma once
1616

17-
#include <mongocxx/v1/auto_encryption-fwd.hpp>
17+
#include <mongocxx/v1/auto_encryption_options-fwd.hpp>
1818

1919
//
2020

@@ -30,7 +30,7 @@ namespace v1 {
3030
/// - [MongoClient Options for Queryable Encryption (MongoDB Manual)](https://www.mongodb.com/docs/manual/core/queryable-encryption/reference/qe-options-clients/)
3131
/// - [MongoClient Options for CSFLE](https://www.mongodb.com/docs/manual/core/csfle/reference/csfle-options-clients/)
3232
///
33-
class auto_encryption {};
33+
class auto_encryption_options {};
3434

3535
} // namespace v1
3636
} // namespace mongocxx
@@ -39,5 +39,5 @@ class auto_encryption {};
3939

4040
///
4141
/// @file
42-
/// Provides @ref mongocxx::v1::auto_encryption.
42+
/// Provides @ref mongocxx::v1::auto_encryption_options.
4343
///

src/mongocxx/include/mongocxx/v1/data_key-fwd.hpp renamed to src/mongocxx/include/mongocxx/v1/data_key_options-fwd.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace mongocxx {
2020
namespace v1 {
2121

22-
class data_key;
22+
class data_key_options;
2323

2424
} // namespace v1
2525
} // namespace mongocxx
@@ -28,5 +28,5 @@ class data_key;
2828

2929
///
3030
/// @file
31-
/// Declares @ref mongocxx::v1::data_key.
31+
/// Declares @ref mongocxx::v1::data_key_options.
3232
///

src/mongocxx/include/mongocxx/v1/data_key.hpp renamed to src/mongocxx/include/mongocxx/v1/data_key_options.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#pragma once
1616

17-
#include <mongocxx/v1/data_key-fwd.hpp>
17+
#include <mongocxx/v1/data_key_options-fwd.hpp>
1818

1919
//
2020

@@ -31,7 +31,7 @@ namespace v1 {
3131
///
3232
/// @attention This feature is experimental! It is not ready for use!
3333
///
34-
class data_key {};
34+
class data_key_options {};
3535

3636
} // namespace v1
3737
} // namespace mongocxx
@@ -40,5 +40,5 @@ class data_key {};
4040

4141
///
4242
/// @file
43-
/// Provides @ref mongocxx::v1::data_key.
43+
/// Provides @ref mongocxx::v1::data_key_options.
4444
///

src/mongocxx/include/mongocxx/v1/auto_encryption-fwd.hpp renamed to src/mongocxx/include/mongocxx/v1/encrypt_options-fwd.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace mongocxx {
2020
namespace v1 {
2121

22-
class auto_encryption;
22+
class encrypt_options;
2323

2424
} // namespace v1
2525
} // namespace mongocxx
@@ -28,5 +28,5 @@ class auto_encryption;
2828

2929
///
3030
/// @file
31-
/// Declares @ref mongocxx::v1::auto_encryption.
31+
/// Declares @ref mongocxx::v1::encrypt_options.
3232
///

src/mongocxx/include/mongocxx/v1/encrypt.hpp renamed to src/mongocxx/include/mongocxx/v1/encrypt_options.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#pragma once
1616

17-
#include <mongocxx/v1/encrypt-fwd.hpp>
17+
#include <mongocxx/v1/encrypt_options-fwd.hpp>
1818

1919
//
2020

@@ -33,7 +33,7 @@ namespace v1 {
3333
///
3434
/// @attention This feature is experimental! It is not ready for use!
3535
///
36-
class encrypt {
36+
class encrypt_options {
3737
// This class implements `EncryptOpts`:
3838
// - https://specifications.readthedocs.io/en/latest/client-side-encryption/client-side-encryption/
3939
};
@@ -45,5 +45,5 @@ class encrypt {
4545

4646
///
4747
/// @file
48-
/// Provides @ref mongocxx::v1::encrypt.
48+
/// Provides @ref mongocxx::v1::encrypt_options.
4949
///

src/mongocxx/include/mongocxx/v1/encrypt-fwd.hpp renamed to src/mongocxx/include/mongocxx/v1/range_options-fwd.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace mongocxx {
2020
namespace v1 {
2121

22-
class encrypt;
22+
class range_options;
2323

2424
} // namespace v1
2525
} // namespace mongocxx
@@ -28,5 +28,5 @@ class encrypt;
2828

2929
///
3030
/// @file
31-
/// Declares @ref mongocxx::v1::encrypt.
31+
/// Declares @ref mongocxx::v1::range_options.
3232
///

src/mongocxx/include/mongocxx/v1/range.hpp renamed to src/mongocxx/include/mongocxx/v1/range_options.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#pragma once
1616

17-
#include <mongocxx/v1/range-fwd.hpp>
17+
#include <mongocxx/v1/range_options-fwd.hpp>
1818

1919
//
2020

@@ -31,7 +31,7 @@ namespace v1 {
3131
///
3232
/// @attention This feature is experimental! It is not ready for use!
3333
///
34-
class range {};
34+
class range_options {};
3535

3636
} // namespace v1
3737
} // namespace mongocxx
@@ -40,5 +40,5 @@ class range {};
4040

4141
///
4242
/// @file
43-
/// Provides @ref mongocxx::v1::range.
43+
/// Provides @ref mongocxx::v1::range_options.
4444
///

src/mongocxx/lib/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ set(mongocxx_sources_v_noabi
123123
set(mongocxx_sources_v1
124124
mongocxx/v1/aggregate_options.cpp
125125
mongocxx/v1/apm.cpp
126-
mongocxx/v1/auto_encryption.cpp
126+
mongocxx/v1/auto_encryption_options.cpp
127127
mongocxx/v1/bulk_write.cpp
128128
mongocxx/v1/change_stream.cpp
129129
mongocxx/v1/client_encryption.cpp
@@ -135,7 +135,7 @@ set(mongocxx_sources_v1
135135
mongocxx/v1/config/version.cpp
136136
mongocxx/v1/count_options.cpp
137137
mongocxx/v1/cursor.cpp
138-
mongocxx/v1/data_key.cpp
138+
mongocxx/v1/data_key_options.cpp
139139
mongocxx/v1/database.cpp
140140
mongocxx/v1/delete_many_options.cpp
141141
mongocxx/v1/delete_many_result.cpp
@@ -144,7 +144,7 @@ set(mongocxx_sources_v1
144144
mongocxx/v1/detail/postlude.cpp
145145
mongocxx/v1/detail/prelude.cpp
146146
mongocxx/v1/distinct_options.cpp
147-
mongocxx/v1/encrypt.cpp
147+
mongocxx/v1/encrypt_options.cpp
148148
mongocxx/v1/estimated_document_count_options.cpp
149149
mongocxx/v1/events/command_failed.cpp
150150
mongocxx/v1/events/command_started.cpp
@@ -180,7 +180,7 @@ set(mongocxx_sources_v1
180180
mongocxx/v1/logger.cpp
181181
mongocxx/v1/pipeline.cpp
182182
mongocxx/v1/pool.cpp
183-
mongocxx/v1/range.cpp
183+
mongocxx/v1/range_options.cpp
184184
mongocxx/v1/read_concern.cpp
185185
mongocxx/v1/read_preference.cpp
186186
mongocxx/v1/replace_one_options.cpp

src/mongocxx/lib/mongocxx/v1/range.cpp renamed to src/mongocxx/lib/mongocxx/v1/auto_encryption_options.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <mongocxx/v1/range.hpp>
15+
#include <mongocxx/v1/auto_encryption_options.hpp>

0 commit comments

Comments
 (0)