Rename BulkWriteCommandBuilder to ClientBulkWrite

Also renames the operation class to ClientBulkWriteCommand to avoid aliasing in Client.

Author: jmikola

src/Client.php

@@ -41,7 +41,7 @@
 use MongoDB\Model\BSONArray;
 use MongoDB\Model\BSONDocument;
 use MongoDB\Model\DatabaseInfo;
-use MongoDB\Operation\ClientBulkWrite;
+use MongoDB\Operation\ClientBulkWriteCommand;
 use MongoDB\Operation\DropDatabase;
 use MongoDB\Operation\ListDatabaseNames;
 use MongoDB\Operation\ListDatabases;
@@ -193,26 +193,26 @@ final public function addSubscriber(Subscriber $subscriber): void
     }
 
     /**
-     * Executes multiple write operations.
+     * Executes multiple write operations across multiple namespaces.
      *
-     * @see ClientBulkWrite::__construct() for supported options
-     * @param string $databaseName Database name
-     * @param array  $options      Additional options
+     * @param BulkWriteCommand|ClientBulkWrite $bulk    Assembled bulk write command or builder
+     * @param array                            $options Additional options
      * @throws UnsupportedException if options are unsupported on the selected server
      * @throws InvalidArgumentException for parameter/option parsing errors
      * @throws DriverRuntimeException for other driver errors (e.g. connection errors)
+     * @see ClientBulkWriteCommand::__construct() for supported options
      */
-    public function bulkWrite(BulkWriteCommand|BulkWriteCommandBuilder $bulk, array $options = []): ?BulkWriteCommandResult
+    public function bulkWrite(BulkWriteCommand|ClientBulkWrite $bulk, array $options = []): ?BulkWriteCommandResult
     {
         if (! isset($options['writeConcern']) && ! is_in_transaction($options)) {
             $options['writeConcern'] = $this->writeConcern;
         }
 
-        if ($bulk instanceof BulkWriteCommandBuilder) {
+        if ($bulk instanceof ClientBulkWrite) {
             $bulk = $bulk->bulkWriteCommand;
         }
 
-        $operation = new ClientBulkWrite($bulk, $options);
+        $operation = new ClientBulkWriteCommand($bulk, $options);
         $server = select_server_for_write($this->manager, $options);
 
         return $operation->execute($server);

src/BulkWriteCommandBuilder.php renamed to src/ClientBulkWrite.php

@@ -27,7 +27,7 @@
 use function is_bool;
 use function is_string;
 
-final readonly class BulkWriteCommandBuilder
+final readonly class ClientBulkWrite
 {
     private function __construct(
         public BulkWriteCommand $bulkWriteCommand,

src/Operation/ClientBulkWrite.php renamed to src/Operation/ClientBulkWriteCommand.php

@@ -34,7 +34,7 @@
  *
  * @see \MongoDB\Client::bulkWrite()
  */
-final class ClientBulkWrite
+final class ClientBulkWriteCommand
 {
     /**
      * Constructs a client-level bulk write operation.

tests/SpecTests/Crud/Prose3_BulkWriteSplitsOnMaxWriteBatchSizeTest.php

@@ -2,7 +2,7 @@
 
 namespace MongoDB\Tests\SpecTests\Crud;
 
-use MongoDB\BulkWriteCommandBuilder;
+use MongoDB\ClientBulkWrite;
 use MongoDB\Driver\Monitoring\CommandFailedEvent;
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
 use MongoDB\Driver\Monitoring\CommandSubscriber;
@@ -30,7 +30,7 @@ public function testSplitOnMaxWriteBatchSize(): void
         self::assertIsInt($maxWriteBatchSize);
 
         $collection = $client->selectCollection($this->getDatabaseName(), $this->getCollectionName());
-        $bulkWrite = BulkWriteCommandBuilder::createWithCollection($collection);
+        $bulkWrite = ClientBulkWrite::createWithCollection($collection);
 
         for ($i = 0; $i < $maxWriteBatchSize + 1; ++$i) {
             $bulkWrite->insertOne(['a' => 'b']);

tests/SpecTests/Crud/Prose4_BulkWriteSplitsOnMaxMessageSizeBytesTest.php

@@ -2,7 +2,7 @@
 
 namespace MongoDB\Tests\SpecTests\Crud;
 
-use MongoDB\BulkWriteCommandBuilder;
+use MongoDB\ClientBulkWrite;
 use MongoDB\Driver\Monitoring\CommandFailedEvent;
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
 use MongoDB\Driver\Monitoring\CommandSubscriber;
@@ -36,7 +36,7 @@ public function testSplitOnMaxWriteBatchSize(): void
         $document = ['a' => str_repeat('b', $maxBsonObjectSize - 500)];
 
         $collection = $client->selectCollection($this->getDatabaseName(), $this->getCollectionName());
-        $bulkWrite = BulkWriteCommandBuilder::createWithCollection($collection);
+        $bulkWrite = ClientBulkWrite::createWithCollection($collection);
 
         for ($i = 0; $i < $numModels; ++$i) {
             $bulkWrite->insertOne($document);

tests/SpecTests/Crud/Prose5_BulkWriteCollectsWriteConcernErrorsAcrossBatchesTest.php

@@ -2,7 +2,7 @@
 
 namespace MongoDB\Tests\SpecTests\Crud;
 
-use MongoDB\BulkWriteCommandBuilder;
+use MongoDB\ClientBulkWrite;
 use MongoDB\Driver\Exception\BulkWriteCommandException;
 use MongoDB\Driver\Monitoring\CommandFailedEvent;
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
@@ -43,7 +43,7 @@ public function testCollectWriteConcernErrors(): void
         ]);
 
         $collection = $client->selectCollection($this->getDatabaseName(), $this->getCollectionName());
-        $bulkWrite = BulkWriteCommandBuilder::createWithCollection($collection);
+        $bulkWrite = ClientBulkWrite::createWithCollection($collection);
 
         for ($i = 0; $i < $maxWriteBatchSize + 1; ++$i) {
             $bulkWrite->insertOne(['a' => 'b']);

tests/SpecTests/Crud/Prose6_BulkWriteHandlesWriteErrorsAcrossBatchesTest.php

@@ -2,7 +2,7 @@
 
 namespace MongoDB\Tests\SpecTests\Crud;
 
-use MongoDB\BulkWriteCommandBuilder;
+use MongoDB\ClientBulkWrite;
 use MongoDB\Driver\Exception\BulkWriteCommandException;
 use MongoDB\Driver\Monitoring\CommandFailedEvent;
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
@@ -39,7 +39,7 @@ public function testOrdered(): void
         $collection->drop();
         $collection->insertOne(['_id' => 1]);
 
-        $bulkWrite = BulkWriteCommandBuilder::createWithCollection($collection, ['ordered' => true]);
+        $bulkWrite = ClientBulkWrite::createWithCollection($collection, ['ordered' => true]);
 
         for ($i = 0; $i < $maxWriteBatchSize + 1; ++$i) {
             $bulkWrite->insertOne(['_id' => 1]);
@@ -68,7 +68,7 @@ public function testUnordered(): void
         $collection->drop();
         $collection->insertOne(['_id' => 1]);
 
-        $bulkWrite = BulkWriteCommandBuilder::createWithCollection($collection, ['ordered' => false]);
+        $bulkWrite = ClientBulkWrite::createWithCollection($collection, ['ordered' => false]);
 
         for ($i = 0; $i < $maxWriteBatchSize + 1; ++$i) {
             $bulkWrite->insertOne(['_id' => 1]);

tests/SpecTests/Crud/Prose7_BulkWriteHandlesCursorRequiringGetMoreTest.php

@@ -2,7 +2,7 @@
 
 namespace MongoDB\Tests\SpecTests\Crud;
 
-use MongoDB\BulkWriteCommandBuilder;
+use MongoDB\ClientBulkWrite;
 use MongoDB\Driver\Monitoring\CommandFailedEvent;
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
 use MongoDB\Driver\Monitoring\CommandSubscriber;
@@ -34,7 +34,7 @@ public function testHandlesCursor(): void
         $collection = $client->selectCollection($this->getDatabaseName(), $this->getCollectionName());
         $collection->drop();
 
-        $bulkWrite = BulkWriteCommandBuilder::createWithCollection($collection, ['verboseResults' => true]);
+        $bulkWrite = ClientBulkWrite::createWithCollection($collection, ['verboseResults' => true]);
         $bulkWrite->updateOne(
             ['_id' => str_repeat('a', (int) ($maxBsonObjectSize / 2))],
             ['$set' => ['x' => 1]],

tests/SpecTests/Crud/Prose8_BulkWriteHandlesCursorRequiringGetMoreWithinTransactionTest.php

@@ -2,7 +2,7 @@
 
 namespace MongoDB\Tests\SpecTests\Crud;
 
-use MongoDB\BulkWriteCommandBuilder;
+use MongoDB\ClientBulkWrite;
 use MongoDB\Driver\Monitoring\CommandFailedEvent;
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
 use MongoDB\Driver\Monitoring\CommandSubscriber;
@@ -35,7 +35,7 @@ public function testHandlesCursorWithinTransaction(): void
         $collection = $client->selectCollection($this->getDatabaseName(), $this->getCollectionName());
         $collection->drop();
 
-        $bulkWrite = BulkWriteCommandBuilder::createWithCollection($collection, ['verboseResults' => true]);
+        $bulkWrite = ClientBulkWrite::createWithCollection($collection, ['verboseResults' => true]);
         $bulkWrite->updateOne(
             ['_id' => str_repeat('a', (int) ($maxBsonObjectSize / 2))],
             ['$set' => ['x' => 1]],

tests/SpecTests/Crud/Prose9_BulkWriteHandlesGetMoreErrorTest.php

@@ -2,7 +2,7 @@
 
 namespace MongoDB\Tests\SpecTests\Crud;
 
-use MongoDB\BulkWriteCommandBuilder;
+use MongoDB\ClientBulkWrite;
 use MongoDB\Driver\Exception\BulkWriteCommandException;
 use MongoDB\Driver\Monitoring\CommandFailedEvent;
 use MongoDB\Driver\Monitoring\CommandStartedEvent;
@@ -46,7 +46,7 @@ public function testHandlesGetMoreError(): void
         $collection = $client->selectCollection($this->getDatabaseName(), $this->getCollectionName());
         $collection->drop();
 
-        $bulkWrite = BulkWriteCommandBuilder::createWithCollection($collection, ['verboseResults' => true]);
+        $bulkWrite = ClientBulkWrite::createWithCollection($collection, ['verboseResults' => true]);
         $bulkWrite->updateOne(
             ['_id' => str_repeat('a', (int) ($maxBsonObjectSize / 2))],
             ['$set' => ['x' => 1]],

tests/UnifiedSpecTests/Operation.php

@@ -259,7 +259,7 @@ private function executeForClient(Client $client)
                 assertArrayHasKey('models', $args);
                 assertIsArray($args['models']);
 
-                // Options for BulkWriteCommand and Server::executeBulkWriteCommand() will be mixed
+                // Options for ClientBulkWriteCommand and Server::executeBulkWriteCommand() will be mixed
                 $options = array_diff_key($args, ['models' => 1]);
 
                 return $client->bulkWrite(