Rebase master

README.md

@@ -19,15 +19,16 @@ This client supports the following Google Cloud Platform services at a [Beta](#v
 -  [Google Cloud Datastore](#google-cloud-datastore-beta) (Beta)
 -  [Google Cloud Storage](#google-cloud-storage-beta) (Beta)
 -  [Cloud Spanner](#cloud-spanner-beta) (Beta)
+-  [Google Cloud Translation](#google-translation-beta) (Beta)
 -  Cloud Vision (Beta)
+-  Cloud Natural Language (Beta)
 
 This client supports the following Google Cloud Platform services at an [Alpha](#versioning) quality level:
 
 -  [Google Cloud Compute](#google-cloud-compute-alpha) (Alpha)
 -  [Google Cloud DNS](#google-cloud-dns-alpha) (Alpha)
 -  [Google Cloud Pub/Sub](#google-cloud-pubsub-alpha) (Alpha - Not working on App Engine Standard)
 -  [Google Cloud Resource Manager](#google-cloud-resource-manager-alpha) (Alpha)
--  [Google Cloud Translate](#google-translate-alpha) (Alpha)
 
 > Note: This client is a work-in-progress, and may occasionally
 > make backwards-incompatible changes.
@@ -45,16 +46,16 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud</artifactId>
-  <version>0.10.0-alpha</version>
+  <version>0.12.0-alpha</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud:0.10.0-alpha'
+compile 'com.google.cloud:google-cloud:0.12.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud" % "0.10.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud" % "0.12.0-alpha"
 ```
 
 For running on Google App Engine, see [more instructions here](./APPENGINE.md).
@@ -88,7 +89,7 @@ Example Applications
   - Read more about using this application on the [`StorageExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/apidocs/?com/google/cloud/examples/storage/StorageExample.html).
 - [`TaskList`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/datastore/src/main/java/com/google/datastore/snippets/TaskList.java) - A command line application that uses Cloud Datastore to manage a to-do list.
   - Read about how to run the application on its [README page](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/datastore).
-- [`TranslateExample`](./google-cloud-examples/src/main/java/com/google/cloud/examples/translate/TranslateExample.java) - A simple command line interface providing some of Google Translate's functionality
+- [`TranslateExample`](./google-cloud-examples/src/main/java/com/google/cloud/examples/translate/TranslateExample.java) - A simple command line interface providing some of Google Translation's functionality
   - Read more about using this application on the [`TranslateExample` docs page](https://googlecloudplatform.github.io/google-cloud-java/apidocs/?com/google/cloud/examples/translate/TranslateExample.html).
 
 Specifying a Project ID
@@ -585,29 +586,31 @@ Google Cloud Pub/Sub (Alpha)
 Here is a code snippet showing a simple usage example from within Compute Engine/App Engine
 Flexible. Note that you must [supply credentials](#authentication) and a project ID if running this
 snippet elsewhere. Complete source code can be found at
-[CreateSubscriptionAndPullMessages.java](./google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndPullMessages.java).
+[CreateTopicAndPublishMessages.java](./google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java).
 
 ```java
-import com.google.cloud.pubsub.Message;
-import com.google.cloud.pubsub.PubSub;
-import com.google.cloud.pubsub.PubSub.MessageConsumer;
-import com.google.cloud.pubsub.PubSub.MessageProcessor;
-import com.google.cloud.pubsub.PubSubOptions;
-import com.google.cloud.pubsub.Subscription;
-import com.google.cloud.pubsub.SubscriptionInfo;
-
-try (PubSub pubsub = PubSubOptions.getDefaultInstance().getService()) {
-  Subscription subscription =
-      pubsub.create(SubscriptionInfo.of("test-topic", "test-subscription"));
-  MessageProcessor callback = new MessageProcessor() {
-    @Override
-    public void process(Message message) throws Exception {
-      System.out.printf("Received message \"%s\"%n", message.getPayloadAsString());
-    }
-  };
-  // Create a message consumer and pull messages (for 60 seconds)
-  try (MessageConsumer consumer = subscription.pullAsync(callback)) {
-    Thread.sleep(60_000);
+import com.google.api.gax.core.ApiFuture;
+import com.google.cloud.pubsub.spi.v1.Publisher;
+import com.google.cloud.pubsub.spi.v1.TopicAdminClient;
+import com.google.protobuf.ByteString;
+import com.google.pubsub.v1.PubsubMessage;
+import com.google.pubsub.v1.TopicName;
+
+TopicName topic = TopicName.create("test-project", "test-topic");
+try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
+  topicAdminClient.createTopic(topic);
+}
+
+Publisher publisher = null;
+try {
+  publisher = Publisher.newBuilder(topic).build();
+  ByteString data = ByteString.copyFromUtf8("my message");
+  PubsubMessage pubsubMessage = PubsubMessage.newBuilder().setData(data).build();
+  ApiFuture<String> messageId = publisher.publish(pubsubMessage);
+  System.out.println("published with message ID: " + messageId.get());
+} finally {
+  if (publisher != null) {
+    publisher.shutdown();
   }
 }
 ```
@@ -647,7 +650,7 @@ while (projectIterator.hasNext()) {
 }
 ```
 
-Google Translate (Alpha)
+Google Translation (Beta)
 ----------------
 
 - [API Documentation][translate-api]

TESTING.md

@@ -145,44 +145,36 @@ uses the `RemoteLoggingHelper` to create a metric.
 
 ### Testing code that uses Pub/Sub
 
-#### On your machine
-
-You can test against a temporary local Pub/Sub by following these steps:
-
-1. Start the local Pub/Sub emulator before running your tests using `LocalPubSubHelper`'s `create`
-and `start` methods. This will bind a port for communication with the local Pub/Sub emulator.
-  ```java
-  LocalPubSubHelper helper = LocalPubSubHelper.create();
-
-  helper.start(); // Starts the local Pub/Sub emulator in a separate process
-  ```
+You can test against a Pub/Sub emulator:
 
-2. Create and use a `PubSub` object with the options given by the `LocalPubSubHelper` instance. For
-example:
-  ```java
-  PubSub localPubsub = helper.getOptions().getService();
-  ```
-
-3. Run your tests.
+1. [Install Cloud SDK](https://cloud.google.com/sdk/downloads)
 
-4. Stop the local Pub/Sub emulator by calling the `stop()` method, like so:
-  ```java
-  helper.stop();
-  ```
-
-#### On a remote machine
+2. Start the emulator:
+```shell
+$ gcloud beta emulators pubsub start
+```
 
-You can test against a remote Pub/Sub emulator as well. To do this, set the `PubSubOptions` project
-endpoint to the hostname of the remote machine, like the example below.
+To determine which host/port the emulator is running on:
+```shell
+$ gcloud beta emulators pubsub env-init
+# Sample output:
+#   export PUBSUB_EMULATOR_HOST=localhost:8759
+```
 
-  ```java
-  PubSubOptions options = PubSubOptions.newBuilder()
-      .setProjectId("my-project-id") // must match project ID specified on remote machine
-      .setHost("<hostname of machine>:<port>")
-      .setCredentials(NoCredentials.getInstance())
-      .build();
-  PubSub localPubsub = options.getService();
-  ```
+3. Point your client to the emulator.
+```java
+ChannelProvider channelProvider =
+    // SubscriptionAdminSettings works too.
+    TopicAdminSettings.defaultChannelProviderBuilder()
+        .setEndpoint(System.getenv("PUBSUB_EMULATOR_HOST"))
+        .setCredentialsProvider(
+            FixedCredentialsProvider.create(NoCredentials.getInstance()))
+        .build();
+TopicAdminClient topicClient = TopicAdminClient.create(
+    TopicAdminSettings.defaultBuilder().setChannelProvider(channelProvider).build());
+Publisher publisher =
+    Publisher.newBuilder(topicName).setChannelProvider(channelProvider).build();
+```
 
 ### Testing code that uses Resource Manager
 
@@ -241,10 +233,10 @@ Here is an example that clears the bucket created in Step 3 with a timeout of 5
   RemoteStorageHelper.forceDelete(storage, bucket, 5, TimeUnit.SECONDS);
   ```
 
-### Testing code that uses Translate
+### Testing code that uses Translation
 
 `RemoteTranslateHelper` contains convenience methods to make is easier to run tests against the
-Google Translate service.
+Google Translation service.
 
 1. Create a test Google Cloud project.
 

google-cloud-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>google-cloud-bigquery</artifactId>
-  <version>0.10.0-beta</version>
+  <version>0.12.0-beta</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-bigquery:0.10.0-beta'
+compile 'com.google.cloud:google-cloud-bigquery:0.12.0-beta'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "0.10.0-beta"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "0.12.0-beta"
 ```
 
 Example Application

google-cloud-bigquery/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.10.1-alpha-SNAPSHOT</version>
+    <version>0.12.1-alpha-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-bigquery</site.installationModule>

google-cloud-compute/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>google-cloud-compute</artifactId>
-  <version>0.10.0-alpha</version>
+  <version>0.12.0-alpha</version>
 </dependency>
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-compute:0.10.0-alpha'
+compile 'com.google.cloud:google-cloud-compute:0.12.0-alpha'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.10.0-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.12.0-alpha"
 ```
 
 Example Application

google-cloud-compute/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pom</artifactId>
-    <version>0.10.1-alpha-SNAPSHOT</version>
+    <version>0.12.1-alpha-SNAPSHOT</version>
   </parent>
   <properties>
     <site.installationModule>google-cloud-compute</site.installationModule>