removes servicebuilder for most BigQuery samples, fixes test table deletion (#237)

bshaffer · web-flow · commit 360f0e3bb9b4 · 2016-11-16T13:06:37.000-08:00
diff --git a/bigquery/api/src/CopyTableCommand.php b/bigquery/api/src/CopyTableCommand.php
@@ -22,7 +22,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 use InvalidArgumentException;
 
 /**
@@ -80,10 +80,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $datasetId = $input->getArgument('dataset');
         $sourceTableId = $input->getArgument('source-table');
-        $builder = new ServiceBuilder([
+        $bigQuery = new BigQueryClient([
             'projectId' => $projectId,
         ]);
-        $bigQuery = $builder->bigQuery();
         $dataset = $bigQuery->dataset($datasetId);
         $sourceTable = $dataset->table($sourceTableId);
         $destinationTableId = $input->getArgument('destination-table');
diff --git a/bigquery/api/src/ExportCommand.php b/bigquery/api/src/ExportCommand.php
@@ -22,7 +22,7 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 use InvalidArgumentException;
 
 /**
@@ -90,10 +90,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             throw new InvalidArgumentException('Table must in the format "dataset.table"');
         }
         list($datasetId, $tableId) = explode('.', $fullTableName);
-        $builder = new ServiceBuilder([
+        $bigQuery = new BigQueryClient([
             'projectId' => $projectId,
         ]);
-        $bigQuery = $builder->bigQuery();
         $dataset = $bigQuery->dataset($datasetId);
         $table = $dataset->table($tableId);
         $destination = $input->getArgument('destination');
diff --git a/bigquery/api/src/ImportCommand.php b/bigquery/api/src/ImportCommand.php
@@ -23,7 +23,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 use InvalidArgumentException;
 use Exception;
 
@@ -96,10 +96,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             throw new InvalidArgumentException('Table must in the format "dataset.table"');
         }
         list($datasetId, $tableId) = explode('.', $fullTableName);
-        $builder = new ServiceBuilder([
+        $bigQuery = new BigQueryClient([
             'projectId' => $projectId,
         ]);
-        $bigQuery = $builder->bigQuery();
         $dataset = $bigQuery->dataset($datasetId);
         $table = $dataset->table($tableId);
         $source = $input->getArgument('source');
diff --git a/bigquery/api/src/SchemaCommand.php b/bigquery/api/src/SchemaCommand.php
@@ -25,7 +25,7 @@
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\ChoiceQuestion;
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\Exception\BadRequestException;
 use InvalidArgumentException;
 use LogicException;
@@ -106,10 +106,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             throw new InvalidArgumentException('Table must in the format "dataset.table"');
         }
         list($datasetId, $tableId) = explode('.', $fullTableName);
-        $builder = new ServiceBuilder([
+        $bigQuery = new BigQueryClient([
             'projectId' => $projectId,
         ]);
-        $bigQuery = $builder->bigQuery();
         $dataset = $bigQuery->dataset($datasetId);
         $table = $dataset->table($tableId);
         if (!$dataset->exists()) {
diff --git a/bigquery/api/src/functions/bigquery_client.php b/bigquery/api/src/functions/bigquery_client.php
@@ -12,11 +12,10 @@
  * ```
  */
 # [START build_service]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 
-$builder = new ServiceBuilder([
+$bigQuery = new BigQueryClient([
     'projectId' => $projectId,
 ]);
-$bigQuery = $builder->bigQuery();
 # [END build_service]
 return $bigQuery;
diff --git a/bigquery/api/src/functions/browse_table.php b/bigquery/api/src/functions/browse_table.php
@@ -24,7 +24,7 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 # [START browse_table]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
  * Browse a bigquery table.
@@ -47,10 +47,9 @@ function browse_table($projectId, $datasetId, $tableId, $maxResults = 10, $start
         'maxResults' => $maxResults,
         'startIndex' => $startIndex
     ];
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
     $dataset = $bigQuery->dataset($datasetId);
     $table = $dataset->table($tableId);
     $numRows = 0;
diff --git a/bigquery/api/src/functions/copy_table.php b/bigquery/api/src/functions/copy_table.php
@@ -25,7 +25,7 @@
 
 use Exception;
 # [START copy_table]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\ExponentialBackoff;
 
 /**
@@ -36,10 +36,9 @@
  */
 function copy_table($projectId, $datasetId, $sourceTableId, $destinationTableId)
 {
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
     $dataset = $bigQuery->dataset($datasetId);
     $sourceTable = $dataset->table($sourceTableId);
     $destinationTable = $dataset->table($destinationTableId);
diff --git a/bigquery/api/src/functions/create_dataset.php b/bigquery/api/src/functions/create_dataset.php
@@ -24,18 +24,17 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 # [START create_dataset]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
  * @param string $projectId The Google project ID.
  * @param string $dataset   The BigQuery dataset ID.
  */
 function create_dataset($projectId, $datasetId)
 {
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
     $dataset = $bigQuery->createDataset($datasetId);
     return $dataset;
 }
diff --git a/bigquery/api/src/functions/create_table.php b/bigquery/api/src/functions/create_table.php
@@ -24,7 +24,7 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 # [START create_table]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
  * Example:
@@ -50,10 +50,9 @@
  */
 function create_table($projectId, $datasetId, $tableId, $schema)
 {
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
     $dataset = $bigQuery->dataset($datasetId);
     $options = ['schema' => $schema];
     $table = $dataset->createTable($tableId, $options);
diff --git a/bigquery/api/src/functions/delete_table.php b/bigquery/api/src/functions/delete_table.php
@@ -24,7 +24,7 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 # [START delete_table]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
  * @param string $projectId The Google project ID.
@@ -33,11 +33,10 @@
  */
 function delete_table($projectId, $datasetId, $tableId)
 {
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
     # [START get_table]
-    $bigQuery = $builder->bigQuery();
     $dataset = $bigQuery->dataset($datasetId);
     $table = $dataset->table($tableId);
     # [END get_table]
diff --git a/bigquery/api/src/functions/import_from_file.php b/bigquery/api/src/functions/import_from_file.php
@@ -26,7 +26,7 @@
 use Exception;
 use InvalidArgumentException;
 # [START import_from_file]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\ExponentialBackoff;
 
 /**
@@ -48,10 +48,9 @@ function import_from_file($projectId, $datasetId, $tableId, $source)
         throw new InvalidArgumentException('Source format unknown. Must be JSON or CSV');
     }
     // instantiate the bigquery table service
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
     $dataset = $bigQuery->dataset($datasetId);
     $table = $dataset->table($tableId);
     // create the import job
diff --git a/bigquery/api/src/functions/import_from_storage.php b/bigquery/api/src/functions/import_from_storage.php
@@ -48,7 +48,7 @@ function import_from_storage($projectId, $datasetId, $tableId, $bucketName, $obj
     $builder = new ServiceBuilder([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
+    $bigQuery = $builder->bigquery();
     $dataset = $bigQuery->dataset($datasetId);
     $table = $dataset->table($tableId);
     // load the storage object
diff --git a/bigquery/api/src/functions/list_datasets.php b/bigquery/api/src/functions/list_datasets.php
@@ -24,17 +24,16 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 # [START list_datasets]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
  * @param string $projectId The Google project ID.
  */
 function list_datasets($projectId)
 {
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
     $datasets = $bigQuery->datasets();
     foreach ($datasets as $dataset) {
         print($dataset->id() . PHP_EOL);
diff --git a/bigquery/api/src/functions/list_tables.php b/bigquery/api/src/functions/list_tables.php
@@ -24,18 +24,17 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 # [START list_tables]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
  * @param string $projectId The Google project ID.
  * @param string $datasetId The BigQuery dataset ID.
  */
 function list_tables($projectId, $datasetId)
 {
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
     $dataset = $bigQuery->dataset($datasetId);
     $tables = $dataset->tables();
     foreach ($tables as $table) {
@@ -50,10 +49,9 @@ function list_tables($projectId, $datasetId)
  */
 function get_table($projectId, $datasetId, $tableId)
 {
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
     $dataset = $bigQuery->dataset($datasetId);
     return $dataset->table($tableId);
 }
diff --git a/bigquery/api/src/functions/run_query.php b/bigquery/api/src/functions/run_query.php
@@ -24,7 +24,7 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 # [START all]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
  * Run a BigQuery query.
@@ -43,10 +43,9 @@
 function run_query($projectId, $query, $useLegacySql)
 {
     # [START build_service]
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
     # [END build_service]
     # [START run_query]
     $queryResults = $bigQuery->runQuery(
diff --git a/bigquery/api/src/functions/run_query_as_job.php b/bigquery/api/src/functions/run_query_as_job.php
@@ -25,7 +25,7 @@
 
 use Exception;
 # [START query_as_job]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\ExponentialBackoff;
 
 /**
@@ -44,10 +44,9 @@
  */
 function run_query_as_job($projectId, $query, $useLegacySql)
 {
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
     $job = $bigQuery->runQueryAsJob(
         $query,
         ['jobConfig' => ['useLegacySql' => $useLegacySql]]);
diff --git a/bigquery/api/src/functions/stream_row.php b/bigquery/api/src/functions/stream_row.php
@@ -24,7 +24,7 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 # [START stream_row]
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
  * Stream a row of data into your BigQuery table
@@ -46,10 +46,9 @@
 function stream_row($projectId, $datasetId, $tableId, $data, $insertId = null)
 {
     // instantiate the bigquery table service
-    $builder = new ServiceBuilder([
+    $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    $bigQuery = $builder->bigQuery();
     $dataset = $bigQuery->dataset($datasetId);
     $table = $dataset->table($tableId);
 
diff --git a/bigquery/api/test/BrowseTableCommandTest.php b/bigquery/api/test/BrowseTableCommandTest.php
@@ -62,7 +62,6 @@ public function testBrowseTable()
             ['interactive' => false]
         );
 
-
         $this->expectOutputRegex('/Found 1 row\(s\)/');
     }
 }
diff --git a/bigquery/api/test/ExportCommandTest.php b/bigquery/api/test/ExportCommandTest.php
@@ -18,7 +18,7 @@
 namespace Google\Cloud\Samples\BigQuery\Tests;
 
 use Google\Cloud\Samples\BigQuery\ExportCommand;
-use Google\Cloud\ServiceBuilder;
+use Google\Cloud\Storage\StorageClient;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -189,10 +189,9 @@ public function testExport($objectName, $format)
         $this->expectOutputRegex('/Data exported successfully/');
 
         // verify the contents of the bucket
-        $builder = new ServiceBuilder([
+        $storage = new StorageClient([
             'projectId' => $projectId,
         ]);
-        $storage = $builder->storage();
         $object = $storage->bucket(self::$gcsBucket)->object($objectName);
         $contents = $object->downloadAsString();
         $this->assertContains('Brent Shaffer', $contents);
diff --git a/bigquery/api/test/ImportCommandTest.php b/bigquery/api/test/ImportCommandTest.php
