CXX-175 rename files and things

Author: TylerBrock

src/SConscript.client

@@ -73,8 +73,8 @@ clientSourceBasic = [
     'mongo/bson/optime.cpp',
     'mongo/bson/util/bson_extract.cpp',
     'mongo/client/bulk_operation_builder.cpp',
-    'mongo/client/bulk_upsert_operation.cpp',
-    'mongo/client/bulk_write_operation.cpp',
+    'mongo/client/bulk_update_builder.cpp',
+    'mongo/client/bulk_upsert_builder.cpp',
     'mongo/client/command_writer.cpp',
     'mongo/client/connpool.cpp',
     'mongo/client/dbclient.cpp',
@@ -187,8 +187,8 @@ clientHeaders = [
     'mongo/bson/util/misc.h',
     'mongo/client/autolib.h',
     'mongo/client/bulk_operation_builder.h',
-    'mongo/client/bulk_upsert_operation.h',
-    'mongo/client/bulk_write_operation.h',
+    'mongo/client/bulk_update_builder.h',
+    'mongo/client/bulk_upsert_builder.h',
     'mongo/client/connpool.h',
     'mongo/client/dbclient.h',
     'mongo/client/dbclient_rs.h',

src/mongo/client/bulk_operation_builder.cpp

@@ -43,8 +43,8 @@ namespace mongo {
             delete *it;
     }
 
-    BulkWriteOperation BulkOperationBuilder::find(const BSONObj& selector) {
-        return BulkWriteOperation(this, selector);
+    BulkUpdateBuilder BulkOperationBuilder::find(const BSONObj& selector) {
+        return BulkUpdateBuilder(this, selector);
     }
 
     void BulkOperationBuilder::insert(const BSONObj& doc) {

src/mongo/client/bulk_operation_builder.h

@@ -18,7 +18,7 @@
 #include <vector>
 
 #include "mongo/bson/bsonobj.h"
-#include "mongo/client/bulk_write_operation.h"
+#include "mongo/client/bulk_update_builder.h"
 
 namespace mongo {
 
@@ -52,11 +52,11 @@ namespace mongo {
      */
     class MONGO_CLIENT_API BulkOperationBuilder {
 
-        /* Enable operations of this type to append themselves to _write_operations */
-        friend class BulkWriteOperation;
+        /* Enable operations of this type to append themselves to enqueue themselves */
+        friend class BulkUpdateBuilder;
 
-        /* Enable operations of this type to append themselves to _write_operations */
-        friend class BulkUpsertOperation;
+        /* Enable operations of this type to append themselves to enqueue themselves */
+        friend class BulkUpsertBuilder;
 
     public:
         /**
@@ -82,7 +82,7 @@ namespace mongo {
          * @param selector A BSONObj that describes the objects to modify.
          * @return BulkWriteOperation A BulkWriteOperation with the selector specified.
          */
-        BulkWriteOperation find(const BSONObj& selector);
+        BulkUpdateBuilder find(const BSONObj& selector);
 
         /**
          * Enqueues an insert write operation to be executed as part of the bulk operation.

src/mongo/client/bulk_write_operation.cpp renamed to src/mongo/client/bulk_update_builder.cpp

@@ -15,7 +15,7 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/client/bulk_write_operation.h"
+#include "mongo/client/bulk_update_builder.h"
 
 #include "mongo/client/bulk_operation_builder.h"
 #include "mongo/client/delete_write_operation.h"
@@ -24,40 +24,40 @@
 
 namespace mongo {
 
-    BulkWriteOperation::BulkWriteOperation(BulkOperationBuilder* const builder, const BSONObj& selector)
+    BulkUpdateBuilder::BulkUpdateBuilder(BulkOperationBuilder* const builder, const BSONObj& selector)
         : _builder(builder)
         , _selector(selector)
         { }
 
-    void BulkWriteOperation::updateOne(const BSONObj& update) {
+    void BulkUpdateBuilder::updateOne(const BSONObj& update) {
         UpdateWriteOperation* update_op = new UpdateWriteOperation(_selector, update, 0);
         _builder->enqueue(update_op);
     }
 
-    void BulkWriteOperation::update(const BSONObj& update) {
+    void BulkUpdateBuilder::update(const BSONObj& update) {
         UpdateWriteOperation* update_op = new UpdateWriteOperation(
             _selector, update, UpdateOption_Multi);
         _builder->enqueue(update_op);
     }
 
-    void BulkWriteOperation::replaceOne(const BSONObj& replacement) {
+    void BulkUpdateBuilder::replaceOne(const BSONObj& replacement) {
         UpdateWriteOperation* update_op = new UpdateWriteOperation(
             _selector, replacement, 0);
         _builder->enqueue(update_op);
     }
 
-    void BulkWriteOperation::remove() {
+    void BulkUpdateBuilder::remove() {
         DeleteWriteOperation* delete_op = new DeleteWriteOperation(_selector, 0);
         _builder->enqueue(delete_op);
     }
 
-    void BulkWriteOperation::removeOne() {
+    void BulkUpdateBuilder::removeOne() {
         DeleteWriteOperation* delete_op = new DeleteWriteOperation(_selector, RemoveOption_JustOne);
         _builder->enqueue(delete_op);
     }
 
-    BulkUpsertOperation BulkWriteOperation::upsert() {
-        return BulkUpsertOperation(_builder, _selector);
+    BulkUpsertBuilder BulkUpdateBuilder::upsert() {
+        return BulkUpsertBuilder(_builder, _selector);
     }
 
 }

src/mongo/client/bulk_write_operation.h renamed to src/mongo/client/bulk_update_builder.h

@@ -16,7 +16,7 @@
 #pragma once
 
 #include "mongo/bson/bsonobj.h"
-#include "mongo/client/bulk_upsert_operation.h"
+#include "mongo/client/bulk_upsert_builder.h"
 
 namespace mongo {
 
@@ -28,7 +28,7 @@ namespace mongo {
      * Not to be instantiated directly. Comes into being via the find() method on
      * BulkOperationBuilder.
      */
-    class MONGO_CLIENT_API BulkWriteOperation {
+    class MONGO_CLIENT_API BulkUpdateBuilder {
 
         friend class BulkOperationBuilder;
 
@@ -68,16 +68,16 @@ namespace mongo {
         /**
          * Specifies that this write operation will be an upsert.
          *
-         * @return BulkUpsertOperation A BulkWriteOperation that is an upsert.
+         * @return BulkUpsertOperation A BulkUpdateBuilder that is an upsert.
          */
-        BulkUpsertOperation upsert();
+        BulkUpsertBuilder upsert();
 
     private:
         BulkOperationBuilder* const _builder;
         const BSONObj& _selector;
 
         /* Only created by freind class BulkOperationBuilder */
-        BulkWriteOperation(BulkOperationBuilder* const builder, const BSONObj& selector);
+        BulkUpdateBuilder(BulkOperationBuilder* const builder, const BSONObj& selector);
     };
 
 } // namespace mongo

src/mongo/client/bulk_upsert_operation.cpp renamed to src/mongo/client/bulk_upsert_builder.cpp

@@ -15,32 +15,32 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/client/bulk_upsert_operation.h"
+#include "mongo/client/bulk_upsert_builder.h"
 
 #include "mongo/client/bulk_operation_builder.h"
 #include "mongo/client/update_write_operation.h"
 #include "mongo/client/write_options.h"
 
 namespace mongo {
 
-    BulkUpsertOperation::BulkUpsertOperation(BulkOperationBuilder* const builder, const BSONObj& selector)
+    BulkUpsertBuilder::BulkUpsertBuilder(BulkOperationBuilder* const builder, const BSONObj& selector)
         : _builder(builder)
         , _selector(selector)
         {}
 
-    void BulkUpsertOperation::updateOne(const BSONObj& update) {
+    void BulkUpsertBuilder::updateOne(const BSONObj& update) {
         UpdateWriteOperation* update_op = new UpdateWriteOperation(
             _selector, update, UpdateOption_Upsert);
         _builder->enqueue(update_op);
     }
 
-    void BulkUpsertOperation::update(const BSONObj& update) {
+    void BulkUpsertBuilder::update(const BSONObj& update) {
         UpdateWriteOperation* update_op = new UpdateWriteOperation(
             _selector, update, UpdateOption_Upsert + UpdateOption_Multi);
         _builder->enqueue(update_op);
     }
 
-    void BulkUpsertOperation::replaceOne(const BSONObj& replacement) {
+    void BulkUpsertBuilder::replaceOne(const BSONObj& replacement) {
         UpdateWriteOperation* update_op = new UpdateWriteOperation(
             _selector, replacement, UpdateOption_Upsert);
         _builder->enqueue(update_op);

src/mongo/client/bulk_upsert_operation.h renamed to src/mongo/client/bulk_upsert_builder.h

@@ -28,9 +28,9 @@ namespace mongo {
      * Not to be instantiated directly. Comes into being via the upsert() method on
      * BulkWriteOperation.
      */
-    class MONGO_CLIENT_API BulkUpsertOperation {
+    class MONGO_CLIENT_API BulkUpsertBuilder {
 
-        friend class BulkWriteOperation;
+        friend class BulkUpdateBuilder;
 
     public:
         /**
@@ -63,7 +63,7 @@ namespace mongo {
         const BSONObj _selector;
 
         /* Only created by freind class BulkWriteBuilder */
-        BulkUpsertOperation(BulkOperationBuilder* const builder, const BSONObj& selector);
+        BulkUpsertBuilder(BulkOperationBuilder* const builder, const BSONObj& selector);
     };
 
 } // namespace mongo