Merge master into gcs-nio

.travis.yml

@@ -9,7 +9,7 @@ before_install:
 - cp target/travis/settings.xml ~/.m2/settings.xml
 install: mvn install -DskipTests=true -Dgpg.skip=true
 script: 
-- utilities/verify.sh
+- travis_wait 30 utilities/verify.sh
 after_success:
 - utilities/after_success.sh
 env:

README.md

@@ -15,6 +15,7 @@ Java idiomatic client for [Google Cloud Platform][cloud-platform] services.
 This client supports the following Google Cloud Platform services:
 
 -  [Google Cloud BigQuery] (#google-cloud-bigquery-alpha) (Alpha)
+-  [Google Cloud Compute] (#google-cloud-compute-alpha) (Alpha)
 -  [Google Cloud Datastore] (#google-cloud-datastore)
 -  [Google Cloud DNS] (#google-cloud-dns-alpha) (Alpha)
 -  [Google Cloud Resource Manager] (#google-cloud-resource-manager-alpha) (Alpha)
@@ -33,23 +34,25 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>gcloud-java</artifactId>
-  <version>0.2.0</version>
+  <version>0.2.3</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:gcloud-java:0.2.0'
+compile 'com.google.cloud:gcloud-java:0.2.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "gcloud-java" % "0.2.0"
+libraryDependencies += "com.google.cloud" % "gcloud-java" % "0.2.3"
 ```
 
 Example Applications
 --------------------
 
 - [`BigQueryExample`](./gcloud-java-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java) - A simple command line interface providing some of Cloud BigQuery's functionality
   - Read more about using this application on the [`BigQueryExample` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/cloud/examples/bigquery/BigQueryExample.html).
+- [`ComputeExample`](./gcloud-java-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java) - A simple command line interface providing some of Cloud Compute's functionality
+  - Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/cloud/examples/compute/ComputeExample.html).
 - [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
   - This app uses `gcloud-java` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
 - [`DatastoreExample`](./gcloud-java-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java) - A simple command line interface for Cloud Datastore
@@ -104,7 +107,7 @@ First, ensure that the necessary Google Cloud APIs are enabled for your project.
 Next, choose a method for authenticating API requests from within your project:
 
 1. When using `gcloud-java` libraries from within Compute/App Engine, no additional authentication steps are necessary.
-2. When using `gcloud-java` libraries elsewhere, there are two options:
+2. When using `gcloud-java` libraries elsewhere, there are three options:
   * [Generate a JSON service account key](https://cloud.google.com/storage/docs/authentication?hl=en#service_accounts).  After downloading that key, you must do one of the following:
     * Define the environment variable GOOGLE_APPLICATION_CREDENTIALS to be the location of the key.  For example:
     ```bash
@@ -113,11 +116,18 @@ Next, choose a method for authenticating API requests from within your project:
     * Supply the JSON credentials file when building the service options.  For example, this Storage object has the necessary permissions to interact with your Google Cloud Storage data:
     ```java
     Storage storage = StorageOptions.builder()
-      .authCredentials(AuthCredentials.createForJson(new FileInputStream("/path/to/my/key.json"))
+        .authCredentials(AuthCredentials.createForJson(new FileInputStream("/path/to/my/key.json"))
+        .build()
+        .service();
+    ```
+  * If running locally for development/testing, you can use Google Cloud SDK.  Download the SDK if you haven't already, then login using the SDK (`gcloud auth login` in command line).  Be sure to set your project ID as described above.
+  * If you already have an OAuth2 access token, you can use it to authenticate (notice that in this case the access token will not be automatically refreshed):
+  ```java
+  Storage storage = StorageOptions.builder()
+      .authCredentials(AuthCredentials.createFor("your_access_token"))
       .build()
       .service();
-    ```
-  * If running locally for development/testing, you can use use Google Cloud SDK.  Download the SDK if you haven't already, then login using the SDK (`gcloud auth login` in command line).  Be sure to set your project ID as described above.
+  ```
 
 `gcloud-java` looks for credentials in the following order, stopping once it finds credentials:
 
@@ -163,16 +173,79 @@ if (table == null) {
 }
 System.out.println("Loading data into table " + tableId);
 Job loadJob = table.load(FormatOptions.csv(), "gs://bucket/path");
-while (!loadJob.isDone()) {
-  Thread.sleep(1000L);
-}
+loadJob = loadJob.waitFor();
 if (loadJob.status().error() != null) {
   System.out.println("Job completed with errors");
 } else {
   System.out.println("Job succeeded");
 }
 ```
 
+Google Cloud Compute (Alpha)
+----------------------
+
+- [API Documentation][compute-api]
+- [Official Documentation][cloud-compute-docs]
+
+#### Preview
+
+Here are two code snippets showing simple usage examples from within Compute/App Engine. Note that
+you must [supply credentials](#authentication) and a project ID if running this snippet elsewhere.
+
+The first snippet shows how to create a snapshot from an existing disk. Complete source code can be
+found at
+[CreateSnapshot.java](./gcloud-java-examples/src/main/java/com/google/cloud/examples/compute/snippets/CreateSnapshot.java).
+
+```java
+import com.google.cloud.compute.Compute;
+import com.google.cloud.compute.ComputeOptions;
+import com.google.cloud.compute.Disk;
+import com.google.cloud.compute.DiskId;
+import com.google.cloud.compute.Snapshot;
+
+Compute compute = ComputeOptions.defaultInstance().service();
+DiskId diskId = DiskId.of("us-central1-a", "disk-name");
+Disk disk = compute.getDisk(diskId, Compute.DiskOption.fields());
+if (disk != null) {
+  String snapshotName = "disk-name-snapshot";
+  Operation operation = disk.createSnapshot(snapshotName);
+  operation = operation.waitFor();
+  if (operation.errors() == null) {
+    // use snapshot
+    Snapshot snapshot = compute.getSnapshot(snapshotName);
+  }
+}
+```
+The second snippet shows how to create a virtual machine instance. Complete source code can be found
+at
+[CreateInstance.java](./gcloud-java-examples/src/main/java/com/google/cloud/examples/compute/snippets/CreateInstance.java).
+```java
+import com.google.cloud.compute.AttachedDisk;
+import com.google.cloud.compute.Compute;
+import com.google.cloud.compute.ComputeOptions;
+import com.google.cloud.compute.ImageId;
+import com.google.cloud.compute.Instance;
+import com.google.cloud.compute.InstanceId;
+import com.google.cloud.compute.InstanceInfo;
+import com.google.cloud.compute.MachineTypeId;
+import com.google.cloud.compute.NetworkId;
+
+Compute compute = ComputeOptions.defaultInstance().service();
+ImageId imageId = ImageId.of("debian-cloud", "debian-8-jessie-v20160329");
+NetworkId networkId = NetworkId.of("default");
+AttachedDisk attachedDisk = AttachedDisk.of(AttachedDisk.CreateDiskConfiguration.of(imageId));
+NetworkInterface networkInterface = NetworkInterface.of(networkId);
+InstanceId instanceId = InstanceId.of("us-central1-a", "instance-name");
+MachineTypeId machineTypeId = MachineTypeId.of("us-central1-a", "n1-standard-1");
+Operation operation =
+    compute.create(InstanceInfo.of(instanceId, machineTypeId, attachedDisk, networkInterface));
+operation = operation.waitFor();
+if (operation.errors() == null) {
+  // use instance
+  Instance instance = compute.getInstance(instanceId);
+}
+```
+
 Google Cloud Datastore
 ----------------------
 
@@ -455,3 +528,7 @@ Apache 2.0 - See [LICENSE] for more information.
 [cloud-bigquery]: https://cloud.google.com/bigquery/
 [cloud-bigquery-docs]: https://cloud.google.com/bigquery/docs/overview
 [bigquery-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/cloud/bigquery/package-summary.html
+
+[cloud-compute]: https://cloud.google.com/compute/
+[cloud-compute-docs]: https://cloud.google.com/compute/docs/overview
+[compute-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/cloud/compute/package-summary.html

gcloud-java-bigquery/README.md

@@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>gcloud-java-bigquery</artifactId>
-  <version>0.2.0</version>
+  <version>0.2.3</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:gcloud-java-bigquery:0.2.0'
+compile 'com.google.cloud:gcloud-java-bigquery:0.2.3'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "gcloud-java-bigquery" % "0.2.0"
+libraryDependencies += "com.google.cloud" % "gcloud-java-bigquery" % "0.2.3"
 ```
 
 Example Application

gcloud-java-bigquery/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>gcloud-java-pom</artifactId>
-    <version>0.2.1-SNAPSHOT</version>
+    <version>0.2.4-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>gcloud-java-bigquery</site.installationModule>
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-bigquery</artifactId>
-      <version>v2-rev270-1.21.0</version>
+      <version>v2-rev303-1.22.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>

gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryException.java

@@ -31,7 +31,7 @@
  * @see <a href="https://cloud.google.com/bigquery/troubleshooting-errors">Google Cloud
  *      BigQuery error codes</a>
  */
-public class BigQueryException extends BaseServiceException {
+public final class BigQueryException extends BaseServiceException {
 
   // see: https://cloud.google.com/bigquery/troubleshooting-errors
   private static final Set<Error> RETRYABLE_ERRORS = ImmutableSet.of(
@@ -44,7 +44,12 @@ public class BigQueryException extends BaseServiceException {
   private final BigQueryError error;
 
   public BigQueryException(int code, String message) {
-    this(code, message, null);
+    this(code, message, (Throwable) null);
+  }
+
+  public BigQueryException(int code, String message, Throwable cause) {
+    super(code, message, null, true, cause);
+    this.error = null;
   }
 
   public BigQueryException(int code, String message, BigQueryError error) {
@@ -100,6 +105,6 @@ public int hashCode() {
    */
   static BaseServiceException translateAndThrow(RetryHelperException ex) {
     BaseServiceException.translateAndPropagateIfPossible(ex);
-    throw new BigQueryException(UNKNOWN_CODE, ex.getMessage());
+    throw new BigQueryException(UNKNOWN_CODE, ex.getMessage(), ex.getCause());
   }
 }

gcloud-java-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java

@@ -164,7 +164,7 @@ public Dataset create(DatasetInfo dataset, DatasetOption... options) {
             public com.google.api.services.bigquery.model.Dataset call() {
               return bigQueryRpc.create(datasetPb, optionsMap);
             }
-          }, options().retryParams(), EXCEPTION_HANDLER));
+          }, options().retryParams(), EXCEPTION_HANDLER, options().clock()));
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
     }
@@ -182,7 +182,7 @@ public Table create(TableInfo table, TableOption... options) {
             public com.google.api.services.bigquery.model.Table call() {
               return bigQueryRpc.create(tablePb, optionsMap);
             }
-          }, options().retryParams(), EXCEPTION_HANDLER));
+          }, options().retryParams(), EXCEPTION_HANDLER, options().clock()));
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
     }
@@ -200,7 +200,7 @@ public Job create(JobInfo job, JobOption... options) {
             public com.google.api.services.bigquery.model.Job call() {
               return bigQueryRpc.create(jobPb, optionsMap);
             }
-          }, options().retryParams(), EXCEPTION_HANDLER));
+          }, options().retryParams(), EXCEPTION_HANDLER, options().clock()));
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
     }
@@ -221,7 +221,7 @@ public Dataset getDataset(final DatasetId datasetId, DatasetOption... options) {
             public com.google.api.services.bigquery.model.Dataset call() {
               return bigQueryRpc.getDataset(datasetId.dataset(), optionsMap);
             }
-          }, options().retryParams(), EXCEPTION_HANDLER);
+          }, options().retryParams(), EXCEPTION_HANDLER, options().clock());
       return answer == null ? null : Dataset.fromPb(this, answer);
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
@@ -244,7 +244,7 @@ private static Page<Dataset> listDatasets(final BigQueryOptions serviceOptions,
                     Iterable<com.google.api.services.bigquery.model.Dataset>> call() {
                   return serviceOptions.rpc().listDatasets(optionsMap);
                 }
-              }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
+              }, serviceOptions.retryParams(), EXCEPTION_HANDLER, serviceOptions.clock());
       String cursor = result.x();
       return new PageImpl<>(new DatasetPageFetcher(serviceOptions, cursor, optionsMap), cursor,
           Iterables.transform(result.y(),
@@ -273,7 +273,7 @@ public boolean delete(final DatasetId datasetId, DatasetDeleteOption... options)
         public Boolean call() {
           return bigQueryRpc.deleteDataset(datasetId.dataset(), optionsMap);
         }
-      }, options().retryParams(), EXCEPTION_HANDLER);
+      }, options().retryParams(), EXCEPTION_HANDLER, options().clock());
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
     }
@@ -292,7 +292,7 @@ public boolean delete(final TableId tableId) {
         public Boolean call() {
           return bigQueryRpc.deleteTable(tableId.dataset(), tableId.table());
         }
-      }, options().retryParams(), EXCEPTION_HANDLER);
+      }, options().retryParams(), EXCEPTION_HANDLER, options().clock());
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
     }
@@ -310,7 +310,7 @@ public Dataset update(DatasetInfo dataset, DatasetOption... options) {
             public com.google.api.services.bigquery.model.Dataset call() {
               return bigQueryRpc.patch(datasetPb, optionsMap);
             }
-          }, options().retryParams(), EXCEPTION_HANDLER));
+          }, options().retryParams(), EXCEPTION_HANDLER, options().clock()));
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
     }
@@ -328,7 +328,7 @@ public Table update(TableInfo table, TableOption... options) {
             public com.google.api.services.bigquery.model.Table call() {
               return bigQueryRpc.patch(tablePb, optionsMap);
             }
-          }, options().retryParams(), EXCEPTION_HANDLER));
+          }, options().retryParams(), EXCEPTION_HANDLER, options().clock()));
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
     }
@@ -349,7 +349,7 @@ public Table getTable(final TableId tableId, TableOption... options) {
             public com.google.api.services.bigquery.model.Table call() {
               return bigQueryRpc.getTable(tableId.dataset(), tableId.table(), optionsMap);
             }
-          }, options().retryParams(), EXCEPTION_HANDLER);
+          }, options().retryParams(), EXCEPTION_HANDLER, options().clock());
       return answer == null ? null : Table.fromPb(this, answer);
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
@@ -377,7 +377,7 @@ private static Page<Table> listTables(final String datasetId, final BigQueryOpti
                 call() {
                   return serviceOptions.rpc().listTables(datasetId, optionsMap);
                 }
-          }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
+          }, serviceOptions.retryParams(), EXCEPTION_HANDLER, serviceOptions.clock());
       String cursor = result.x();
       Iterable<Table> tables = Iterables.transform(result.y(),
           new Function<com.google.api.services.bigquery.model.Table, Table>() {
@@ -432,7 +432,7 @@ public BigQueryRpc.Tuple<String, Iterable<TableRow>> call() {
               return serviceOptions.rpc()
                   .listTableData(tableId.dataset(), tableId.table(), optionsMap);
             }
-          }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
+          }, serviceOptions.retryParams(), EXCEPTION_HANDLER, serviceOptions.clock());
       String cursor = result.x();
       return new PageImpl<>(new TableDataPageFetcher(tableId, serviceOptions, cursor, optionsMap),
           cursor, transformTableData(result.y()));
@@ -467,7 +467,7 @@ public Job getJob(final JobId jobId, JobOption... options) {
             public com.google.api.services.bigquery.model.Job call() {
               return bigQueryRpc.getJob(jobId.job(), optionsMap);
             }
-          }, options().retryParams(), EXCEPTION_HANDLER);
+          }, options().retryParams(), EXCEPTION_HANDLER, options().clock());
       return answer == null ? null : Job.fromPb(this, answer);
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
@@ -489,7 +489,7 @@ private static Page<Job> listJobs(final BigQueryOptions serviceOptions,
               call() {
             return serviceOptions.rpc().listJobs(optionsMap);
           }
-        }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
+        }, serviceOptions.retryParams(), EXCEPTION_HANDLER, serviceOptions.clock());
     String cursor = result.x();
     Iterable<Job> jobs = Iterables.transform(result.y(),
         new Function<com.google.api.services.bigquery.model.Job, Job>() {
@@ -514,7 +514,7 @@ public boolean cancel(final JobId jobId) {
         public Boolean call() {
           return bigQueryRpc.cancel(jobId.job());
         }
-      }, options().retryParams(), EXCEPTION_HANDLER);
+      }, options().retryParams(), EXCEPTION_HANDLER, options().clock());
     } catch (RetryHelper.RetryHelperException e) {
       throw BigQueryException.translateAndThrow(e);
     }
@@ -529,7 +529,7 @@ public QueryResponse query(final QueryRequest request) {
             public com.google.api.services.bigquery.model.QueryResponse call() {
               return bigQueryRpc.query(request.setProjectId(options().projectId()).toPb());
             }
-          }, options().retryParams(), EXCEPTION_HANDLER);
+          }, options().retryParams(), EXCEPTION_HANDLER, options().clock());
       QueryResponse.Builder builder = QueryResponse.builder();
       JobId completeJobId = JobId.fromPb(results.getJobReference());
       builder.jobId(completeJobId);
@@ -574,7 +574,7 @@ private static QueryResponse getQueryResults(final JobId jobId,
             public GetQueryResultsResponse call() {
               return serviceOptions.rpc().getQueryResults(jobId.job(), optionsMap);
             }
-          }, serviceOptions.retryParams(), EXCEPTION_HANDLER);
+          }, serviceOptions.retryParams(), EXCEPTION_HANDLER, serviceOptions.clock());
       QueryResponse.Builder builder = QueryResponse.builder();
       JobId completeJobId = JobId.fromPb(results.getJobReference());
       builder.jobId(completeJobId);