---

mziccard · garrettjonesgoogle · commit 5154fd59263d · 2017-02-22T18:17:57.000-08:00
yaml --- r: 7849 b: refs/heads/tswast-patch-1 c: d7267f5 h: refs/heads/master i: 7847: 56e9d92
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: a5999728f55f3657482a9b6fa671d432be56989f
+refs/heads/tswast-patch-1: d7267f56e7c641f5f758fc0186767e3c3d6a1559
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/README.md b/branches/tswast-patch-1/README.md
@@ -109,12 +109,12 @@ Most `google-cloud` libraries require a project ID.  There are multiple ways to
 
 `google-cloud` determines the project ID from the following sources in the listed order, stopping once it finds a value:
 
-1. Project ID supplied when building the service options
+1. The project ID supplied when building the service options
 2. Project ID specified by the environment variable `GOOGLE_CLOUD_PROJECT`
-3. App Engine project ID
-4. Project ID specified in the JSON credentials file pointed by the `GOOGLE_APPLICATION_CREDENTIALS` environment variable
-5. Google Cloud SDK project ID
-6. Compute Engine project ID
+3. The App Engine project ID
+4. The project ID specified in the JSON credentials file pointed by the `GOOGLE_APPLICATION_CREDENTIALS` environment variable
+5. The Google Cloud SDK project ID
+6. The Compute Engine project ID
 
 Authentication
 --------------
diff --git a/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/HttpServiceOptions.java b/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/HttpServiceOptions.java
@@ -58,7 +58,7 @@ public static class DefaultHttpTransportFactory implements HttpTransportFactory
     @Override
     public HttpTransport create() {
       // Consider App Engine
-      if (appEngineAppId() != null) {
+      if (getAppEngineAppId() != null) {
         try {
           return new UrlFetchTransport();
         } catch (Exception ignore) {
diff --git a/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -176,7 +176,8 @@ public B setClock(Clock clock) {
     }
 
     /**
-     * Sets project id.
+     * Sets the project ID. If no project ID is set, {@link #getDefaultProjectId()} will be used to
+     * attempt getting the project ID from the environment.
      *
      * @return the builder
      */
@@ -186,7 +187,8 @@ public B projectId(String projectId) {
     }
 
     /**
-     * Sets project id.
+     * Sets the project ID. If no project ID is set, {@link #getDefaultProjectId()} will be used to
+     * attempt getting the project ID from the environment.
      *
      * @return the builder
      */
@@ -316,10 +318,6 @@ private static GoogleCredentials defaultCredentials() {
     }
   }
 
-  protected static String appEngineAppId() {
-    return System.getProperty("com.google.appengine.application.id");
-  }
-
   @Deprecated
   protected String defaultHost() {
     return getDefaultHost();
@@ -335,21 +333,41 @@ protected String defaultProject() {
   }
 
   protected String getDefaultProject() {
+    return getDefaultProjectId();
+  }
+
+  /**
+   * Returns the default project ID, or {@code null} if no default project ID could be found. This
+   * method returns the first available project ID among the following sources:
+   * <ol>
+   *   <li>The project ID specified by the GOOGLE_CLOUD_PROJECT environment variable
+   *   <li>The App Engine project ID
+   *   <li>The project ID specified in the JSON credentials file pointed by the
+   *   {@code GOOGLE_APPLICATION_CREDENTIALS} environment variable
+   *   <li>The Google Cloud SDK project ID
+   *   <li>The Compute Engine project ID
+   * </ol>
+   */
+  public static String getDefaultProjectId() {
     String projectId = System.getProperty(PROJECT_ENV_NAME, System.getenv(PROJECT_ENV_NAME));
     if (projectId == null) {
       projectId =
           System.getProperty(LEGACY_PROJECT_ENV_NAME, System.getenv(LEGACY_PROJECT_ENV_NAME));
     }
     if (projectId == null) {
-      projectId = appEngineProjectId();
+      projectId = getAppEngineProjectId();
     }
     if (projectId == null) {
-      projectId = serviceAccountProjectId();
+      projectId = getServiceAccountProjectId();
     }
-    return projectId != null ? projectId : googleCloudProjectId();
+    return projectId != null ? projectId : getGoogleCloudProjectId();
+  }
+
+  protected static String getAppEngineAppId() {
+    return System.getProperty("com.google.appengine.application.id");
   }
 
-  private static String activeGoogleCloudConfig(File configDir) {
+  private static String getActiveGoogleCloudConfig(File configDir) {
     String activeGoogleCloudConfig = null;
     try {
       activeGoogleCloudConfig =
@@ -361,7 +379,7 @@ private static String activeGoogleCloudConfig(File configDir) {
     return firstNonNull(activeGoogleCloudConfig, "default");
   }
 
-  protected static String googleCloudProjectId() {
+  protected static String getGoogleCloudProjectId() {
     File configDir;
     if (System.getenv().containsKey("CLOUDSDK_CONFIG")) {
       configDir = new File(System.getenv("CLOUDSDK_CONFIG"));
@@ -370,7 +388,7 @@ protected static String googleCloudProjectId() {
     } else {
       configDir = new File(System.getProperty("user.home"), ".config/gcloud");
     }
-    String activeConfig = activeGoogleCloudConfig(configDir);
+    String activeConfig = getActiveGoogleCloudConfig(configDir);
     FileReader fileReader = null;
     try {
       fileReader = new FileReader(new File(configDir, "configurations/config_" + activeConfig));
@@ -429,7 +447,7 @@ private static boolean isWindows() {
     return System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows");
   }
 
-  protected static String appEngineProjectId() {
+  protected static String getAppEngineProjectId() {
     try {
       Class<?> factoryClass =
           Class.forName("com.google.appengine.api.appidentity.AppIdentityServiceFactory");
@@ -447,7 +465,7 @@ protected static String appEngineProjectId() {
     }
   }
 
-  protected static String serviceAccountProjectId() {
+  protected static String getServiceAccountProjectId() {
     String project = null;
     String credentialsPath = System.getenv("GOOGLE_APPLICATION_CREDENTIALS");
     if (credentialsPath != null) {
@@ -488,17 +506,17 @@ public ServiceRpcT getRpc() {
   }
 
   /**
-   * Returns the project id. Return value can be null (for services that don't require a project
-   * id).
+   * Returns the project ID. Return value can be null (for services that don't require a project
+   * ID).
    */
   @Deprecated
   public String projectId() {
     return getProjectId();
   }
 
   /**
-   * Returns the project id. Return value can be null (for services that don't require a project
-   * id).
+   * Returns the project ID. Return value can be null (for services that don't require a project
+   * ID).
    */
   public String getProjectId() {
     return projectId;
