Merge branch 'master' into long-semaphore

pongad · web-flow · commit fd0984b1716b · 2017-05-11T10:39:25.000+10:00
diff --git a/README.md b/README.md
@@ -822,6 +822,9 @@ This client is supported on Mac OS X, Windows and Linux (excluding Android and A
 Google Cloud Platform environments currently supported include GCE, GKE and GAE Flex.
 GAE Standard is not currently supported.
 
+Spring Boot users : Native Tomcat is not currently supported. Please use [embedded Jetty](https://docs.spring.io/spring-boot/docs/current/reference/html/howto-embedded-servlet-containers.html#howto-use-jetty-instead-of-tomcat)
+to get your application working with this client.
+
 Testing
 -------
 
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java
@@ -33,8 +33,8 @@
 public class CreateSubscriptionAndConsumeMessages {
 
   public static void main(String... args) throws Exception {
-    TopicName topic = TopicName.create("test-project", "test-topic");
-    SubscriptionName subscription = SubscriptionName.create("test-project", "test-subscription");
+    TopicName topic = TopicName.create("my-project-id", "my-topic-id");
+    SubscriptionName subscription = SubscriptionName.create("my-project-id", "my-topic-id");
 
     try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
       subscriptionAdminClient.createSubscription(subscription, topic, PushConfig.getDefaultInstance(), 0);
@@ -44,7 +44,7 @@ public static void main(String... args) throws Exception {
         new MessageReceiver() {
           @Override
           public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
-            System.out.println("got message: " + message.getData().toStringUtf8());
+            System.out.println("Received message: " + message.getData().toStringUtf8());
             consumer.ack();
           }
         };
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java
@@ -34,15 +34,15 @@
 public class CreateTopicAndPublishMessages {
 
   public static void createTopic() throws Exception {
-    TopicName topic = TopicName.create("test-project", "test-topic");
+    TopicName topic = TopicName.create("my-project-id", "my-topic-id");
     try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
       topicAdminClient.createTopic(topic);
     }
   }
 
   public static void publishMessages() throws Exception {
     // [START publish]
-    TopicName topicName = TopicName.create("test-project", "test-topic");
+    TopicName topicName = TopicName.create("my-project-id", "my-topic-id");
     Publisher publisher = null;
     List<ApiFuture<String>> messageIdFutures = new ArrayList<>();
 
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java
@@ -86,8 +86,9 @@ private void createSubscriber() throws Exception {
     MessageReceiver receiver = new MessageReceiver() {
           @Override
           public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
-            // handle incoming message, then ack or nack the received message
-            // ...
+            // handle incoming message, then ack/nack the received message
+            System.out.println("Id : " + message.getMessageId());
+            System.out.println("Data : " + message.getData().toStringUtf8());
             consumer.ack();
           }
         };
@@ -107,10 +108,8 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
     // [END pullSubscriber]
   }
 
-  private Subscriber createSubscriberWithErrorListener() throws Exception {
+  private Subscriber createSubscriberWithErrorListener(Subscriber subscriber) throws Exception {
     // [START subscriberWithErrorListener]
-    Subscriber subscriber = Subscriber.defaultBuilder(subscriptionName, receiver).build();
-
     subscriber.addListener(new Subscriber.Listener() {
       public void failed(Subscriber.State from, Throwable failure) {
         // Handle error.
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.spanner;
 
-import com.google.cloud.BaseServiceException;
 import com.google.cloud.grpc.BaseGrpcServiceException;
 import com.google.common.base.Preconditions;
 import javax.annotation.Nullable;
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java
@@ -105,6 +105,13 @@ public static HttpTransportOptions getDefaultHttpTransportOptions() {
     return HttpTransportOptions.newBuilder().build();
   }
 
+  // Project ID is only required for creating buckets, so we don't require it for creating the
+  // service.
+  @Override
+  protected boolean projectIdRequired() {
+    return false;
+  }
+
   @Override
   protected Set<String> getScopes() {
     return SCOPES;
diff --git a/pom.xml b/pom.xml
@@ -129,7 +129,8 @@
     <site.installationModule>google-cloud</site.installationModule>
 
     <api-client.version>1.21.0</api-client.version>
-    <api-common.version>1.0.0</api-common.version>
+
+    <api-common.version>1.1.0</api-common.version>
     <gax.version>1.1.0</gax.version>
     <gax-grpc.version>0.17.0</gax-grpc.version>
     <generatedProto.version>0.1.9</generatedProto.version>
