Modify the operation class to use the new validateOptions method

Author: Hectorhammett

Datastore/src/DatastoreClient.php

@@ -753,7 +753,7 @@ public function updateBatch(array $entities, array $options = [])
             'allowOverwrite' => false
         ];
 
-        $this->operation->checkOverwrite($entities, $options['allowOverwrite']);
+        $this->operation->checkOverwrite($entities, $this->pluck('allowOverwrite', $options));
         $mutations = [];
         foreach ($entities as $entity) {
             $mutations[] = $this->operation->mutation('update', $entity, Entity::class);
@@ -917,7 +917,7 @@ public function deleteBatch(array $keys, array $options = [])
 
         $mutations = [];
         foreach ($keys as $key) {
-            $mutations[] = $this->operation->mutation('delete', $key, Key::class, $options['baseVersion']);
+            $mutations[] = $this->operation->mutation('delete', $key, Key::class, $this->pluck('baseVersion', $options, false));
         }
 
         return $this->operation->commit($mutations, $options);

Datastore/src/Operation.php

@@ -17,7 +17,9 @@
 
 namespace Google\Cloud\Datastore;
 
+use Google\ApiCore\Options\CallOptions;
 use Google\ApiCore\Serializer;
+use Google\Cloud\Core\ApiHelperTrait;
 use Google\Cloud\Core\Timestamp;
 use Google\Cloud\Core\TimestampTrait;
 use Google\Cloud\Core\ValidateTrait;
@@ -62,6 +64,7 @@ class Operation
     use DatastoreTrait;
     use ValidateTrait;
     use TimestampTrait;
+    use ApiHelperTrait;
 
     /**
      * @var DatastoreClient
@@ -682,30 +685,28 @@ public function runAggregationQuery(AggregationQuery $runQueryObj, array $option
     public function commit(array $mutations, array $options = [])
     {
         $options += [
-            'transaction' => null,
             'databaseId' => $this->databaseId,
+            'projectId' => $this->projectId,
+            'mutations' => $mutations,
         ];
 
-        $transactionMode = isset($options['transaction']) ? Mode::TRANSACTIONAL : Mode::NON_TRANSACTIONAL;
-
-        $protoMutations = [];
-        foreach ($mutations as $mutation) {
-            $protoMutation = new Mutation();
-            $protoMutation->mergeFromJsonString(json_encode($mutation));
-            $protoMutations[] = $protoMutation;
-        }
-
-        $commitRequest = (new CommitRequest())
-            ->setMutations($protoMutations)
-            ->setDatabaseId($options['databaseId'])
-            ->setProjectId($this->projectId)
-            ->setMode($transactionMode);
+        /**
+         * @var CallOptions $callOptions
+         * @var CommitRequest $commitRequest
+        */
+        [$commitRequest, $callOptions] = $this->validateOptions(
+            $options,
+            new CommitRequest(),
+            CallOptions::class,
+        );
 
-        if ($transactionMode === Mode::TRANSACTIONAL) {
-            $commitRequest->setTransaction(base64_decode($options['transaction']));
-        }
+        $commitRequest->setMode(
+            empty($commitRequest->getTransaction())
+            ? MODE::NON_TRANSACTIONAL
+            : MODE::TRANSACTIONAL
+        );
 
-        $commitResponse = $this->gapicClient->commit($commitRequest, $options);
+        $commitResponse = $this->gapicClient->commit($commitRequest, $callOptions);
 
         return $this->serializer->encodeMessage($commitResponse);
     }

Datastore/tests/Unit/DatastoreClientTest.php

@@ -374,11 +374,18 @@ public function testDatastoreCrudOperations()
 
         // 1. Test Insert
         $this->gapicClient->commit(Argument::that(function(CommitRequest $request) {
-            return $request->getMutations()[0]->getOperation() == 'insert';
-        }), [
-            'transaction' => null,
-            'databaseId' => self::DATABASE
-        ])->shouldBeCalledTimes(1)
+            switch ($request->getMutations()[0]->getOperation()) {
+                case 'insert':
+                case 'update':
+                case 'upsert':
+                case 'delete':
+                    return true;
+                default:
+                    $this->fail('Unexpected value received to the commit function');
+                    return false;
+            }
+            return true;
+        }), Argument::any())->shouldBeCalledTimes(4)
             ->willReturn($commitResponse);
 
         $this->client->insert($entity);
@@ -387,46 +394,15 @@ public function testDatastoreCrudOperations()
         $updateData = ['firstName' => 'Jeffrey'];
         $updateEntity = $this->client->entity($key, $updateData, ['populatedByService' => true]);
 
-        $this->gapicClient->commit(
-            Argument::that(function (CommitRequest $request) {
-                return $request->getMutations()[0]->getOperation() == 'update';
-            }),
-            [
-                'transaction' => null,
-                'databaseId' => self::DATABASE,
-                'allowOverwrite' => false,
-            ]
-        )->shouldBeCalledTimes(1)
-            ->willReturn($commitResponse);
-
         $this->client->update($updateEntity);
 
         // 3. Test Upsert
         $upsertData = ['firstName' => 'Geoff'];
         $upsertEntity = $this->client->entity($key, $upsertData);
 
-        $this->gapicClient->commit(
-            Argument::that(function (CommitRequest $request) {
-                return $request->getMutations()[0]->getOperation() == 'upsert';
-            }),
-            [
-                'transaction' => null,
-                'databaseId' => self::DATABASE,
-            ]
-        )->shouldBeCalledTimes(1)
-            ->willReturn($commitResponse);
-
         $this->client->upsert($upsertEntity);
 
         // 4. Test Delete
-        $this->gapicClient->commit(Argument::that(function(CommitRequest $request) {
-            return $request->getMutations()[0]->getOperation() == 'delete';
-        }), [
-            'baseVersion' => null,
-            'transaction' => null,
-            'databaseId' => self::DATABASE,
-        ])->shouldBeCalledTimes(1)->willReturn($commitResponse);
-
         $this->client->delete($key);
     }