---

Ajay Kannan · Ajay Kannan · commit bf24c5b09c0e · 2015-11-10T15:38:36.000-08:00
yaml --- r: 1905 b: refs/heads/pubsub-alpha c: 6c40825 h: refs/heads/master i: 1903: a79561d
diff --git a/[refs] b/[refs]
@@ -3,7 +3,7 @@ refs/heads/master: 689bbb466df4b2d5d2483d6edb8ac5c7c7f7c6fa
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
-refs/heads/pubsub-alpha: ad12f4143bbcb5d6557055452717c7380cf54959
+refs/heads/pubsub-alpha: 6c408256e1621c7e0f3640fb7a4ffdef139f5241
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
 refs/heads/update-datastore: 482954f2c5055231e5b3122ea91d2ba00ce8187c
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/branches/pubsub-alpha/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/branches/pubsub-alpha/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -17,7 +17,7 @@
 package com.google.gcloud;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkArgument;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.client.extensions.appengine.http.UrlFetchTransport;
@@ -308,7 +308,10 @@ protected ServiceOptions(Class<? extends ServiceFactory<ServiceT, OptionsT>> ser
       Builder<ServiceT, ServiceRpcT, OptionsT, ?> builder) {
     projectId = builder.projectId != null ? builder.projectId : defaultProject();
     if (projectIdRequired()) {
-      checkNotNull(projectId);
+      checkArgument(
+          projectId != null,
+          "A project ID is required for this service but could not be determined from the builder or "
+          + "the environment.  Please set a project ID using the builder.");
     }
     host = firstNonNull(builder.host, defaultHost());
     httpTransportFactory = firstNonNull(builder.httpTransportFactory,
@@ -334,7 +337,7 @@ protected ServiceOptions(Class<? extends ServiceFactory<ServiceT, OptionsT>> ser
    *
    * @return true if a project ID is required to use the service, false if not.
    */
-  public boolean projectIdRequired() {
+  protected boolean projectIdRequired() {
     return true;
   }
 
