remove old clients

Author: bshaffer

Core/src/RequestProcessorTrait.php

@@ -24,6 +24,7 @@
 use Google\Cloud\Core\Exception\ServiceException;
 use Google\Rpc\BadRequest;
 use Google\Rpc\Code;
+use Google\Rpc\RetryInfo;
 
 /**
  * @internal

Spanner/src/Admin/Database/V1/DatabaseAdminClient.php

@@ -130,23 +130,31 @@ class Database
     /**
      * @var bool
      */
-    private $isRunningTransaction = false;
+    private bool $isRunningTransaction = false;
 
     /**
      * @var array
      */
-    private $directedReadOptions;
+    private array $directedReadOptions;
 
     /**
      * @var bool
      */
-    private $routeToLeader;
+    private bool $routeToLeader;
 
     /**
      * @var array
      */
     private $defaultQueryOptions;
 
+    private string $databaseRole;
+
+    private bool $returnInt64AsObject;
+
+    private ?SessionPoolInterface $sessionPool;
+
+    private array $info;
+
     /**
      * @var array
      */
@@ -169,18 +177,20 @@ class Database
      * @param Instance $instance The instance in which the database exists.
      * @param string $projectId The project ID.
      * @param string $name The database name or ID.
-     * @param SessionPoolInterface $sessionPool [optional] The session pool
-     *        implementation.
-     * @param bool $returnInt64AsObject [optional If true, 64 bit integers will
-     *        be returned as a {@see \Google\Cloud\Core\Int64} object for 32 bit
-     *        platform compatibility. **Defaults to** false.
-     * @param string $databaseRole The user created database role which creates the session.
-     * @param string $config [Optional] {
-     *     Configuration options.
+     * @param string $options [Optional] {
+     *     Database options.
      *
      *     @type bool $routeToLeader Enable/disable Leader Aware Routing.
      *         **Defaults to** `true` (enabled).
      *     @type array $defaultQueryOptions
+     *     @type SessionPoolInterface $sessionPool The session pool
+     *         implementation.
+     *     @type bool $returnInt64AsObject If true, 64 bit integers will
+     *         be returned as a {@see \Google\Cloud\Core\Int64} object for 32 bit
+     *         platform compatibility. **Defaults to** false.
+     *     @type string $databaseRole The user created database role which
+     *         creates the session.
+     *     @type array $database The database info.
      * }
      */
     public function __construct(
@@ -190,22 +200,22 @@ public function __construct(
         private Instance $instance,
         private string $projectId,
         private string $name,
-        private ?SessionPoolInterface $sessionPool = null,
-        private bool $returnInt64AsObject = false,
-        private array $info = [],
-        private string $databaseRole = '',
-        array $config = []
+        array $options = [],
     ) {
         $this->name = $this->fullyQualifiedDatabaseName($name);
-        $this->routeToLeader = $config['routeToLeader'] ?? true;
-        $this->defaultQueryOptions = $config['defaultQueryOptions'] ?? [];
+        $this->routeToLeader = $options['routeToLeader'] ?? true;
+        $this->defaultQueryOptions = $options['defaultQueryOptions'] ?? [];
+        $this->databaseRole = $options['databaseRole'] ?? '';
+        $this->returnInt64AsObject = $options['returnInt64AsObject'] ?? false;
+        $this->sessionPool = $options['sessionPool'] ?? null;
+        $this->info = $options['database'] ?? [];
         $this->operation = new Operation(
             $this->spannerClient,
             $serializer,
-            $returnInt64AsObject,
             [
                 'routeToLeader' => $this->routeToLeader,
-                'defaultQueryOptions' => $this->defaultQueryOptions
+                'defaultQueryOptions' => $this->defaultQueryOptions,
+                'returnInt64AsObject' => $this->returnInt64AsObject,
             ]
         );
 

Spanner/src/Admin/Instance/V1/InstanceAdminClient.php

@@ -490,12 +490,20 @@ public function createDatabaseFromBackup($name, $backup, array $options = []): L
      * ```
      *
      * @param string $name The database name
-     * @param array $options [optional] {
+     * @param array $options {
      *     Configuration options.
      *
-     *     @type SessionPoolInterface $sessionPool A pool used to manage
-     *           sessions.
-     *     @type string $databaseRole The user created database role which creates the session.
+     *     @type bool $routeToLeader Enable/disable Leader Aware Routing.
+     *         **Defaults to** `true` (enabled).
+     *     @type array $defaultQueryOptions
+     *     @type SessionPoolInterface $sessionPool The session pool
+     *         implementation.
+     *     @type bool $returnInt64AsObject If true, 64 bit integers will
+     *         be returned as a {@see \Google\Cloud\Core\Int64} object for 32 bit
+     *         platform compatibility. **Defaults to** false.
+     *     @type string $databaseRole The user created database role which
+     *         creates the session.
+     *     @type array $database The database info.
      * }
      * @return Database
      */
@@ -508,13 +516,10 @@ public function database($name, array $options = []): Database
             $this,
             $this->projectId,
             $name,
-            isset($options['sessionPool']) ? $options['sessionPool'] : null,
-            $this->returnInt64AsObject,
-            isset($options['database']) ? $options['database'] : [],
-            isset($options['databaseRole']) ? $options['databaseRole'] : '',
-            [
+            $options + [
                 'routeToLeader' => $this->routeToLeader,
                 'defaultQueryOptions' => $this->defaultQueryOptions,
+                'returnInt64AsObject' => $this->returnInt64AsObject,
             ]
         );
     }

Spanner/src/Admin/Instance/V1/InstanceConfig.php

@@ -77,24 +77,23 @@ class Operation
     /**
      * @param SpannerClient $spannerClient The Spanner client used to make requests.
      * @param Serializer $serializer The serializer instance to encode/decode messages.
-     * @param bool $returnInt64AsObject If true, 64 bit integers will be
-     *        returned as a {@see \Google\Cloud\Core\Int64} object for 32 bit
-     *        platform compatibility.
      * @param array $config [optional] {
      *     Configuration options.
      *
      *     @type bool $routeToLeader Enable/disable Leader Aware Routing.
      *         **Defaults to** `true` (enabled).
      *     @type array $defaultQueryOptions
+     *     @type bool $returnInt64AsObject If true, 64 bit integers will be
+     *        returned as a {@see \Google\Cloud\Core\Int64} object for 32 bit
+     *        platform compatibility.
      * }
      */
     public function __construct(
         private SpannerClient $spannerClient,
         private Serializer $serializer,
-        bool $returnInt64AsObject,
         $config = []
     ) {
-        $this->mapper = new ValueMapper($returnInt64AsObject);
+        $this->mapper = new ValueMapper($options['returnInt64AsObject'] ?? false);
         $this->routeToLeader = $this->pluck('routeToLeader', $config, false) ?: true;
         $this->defaultQueryOptions =
             $this->pluck('defaultQueryOptions', $config, false) ?: [];

Spanner/src/Database.php

@@ -307,10 +307,10 @@ public function batch($instanceId, $databaseId, array $options = [])
         $operation = new Operation(
             $this->spannerClient,
             $this->serializer,
-            $this->returnInt64AsObject,
             [
                 'routeToLeader' => $this->routeToLeader,
-                'defaultQueryOptions' => $this->defaultQueryOptions
+                'defaultQueryOptions' => $this->defaultQueryOptions,
+                'returnInt64AsObject' => $this->returnInt64AsObject,
             ]
         );