First look for AE's project id, then GOOGLE_APPLICATION_CREDENTIALS'

googleapis · Apr 4, 2016 · cf6ac54 · cf6ac54
1 parent 3be6174
commit cf6ac54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -83,8 +83,8 @@ Most `gcloud-java` libraries require a project ID.  There are multiple ways to s
 
 1. Project ID supplied when building the service options
 2. Project ID specified by the environment variable `GCLOUD_PROJECT`
-3. Project ID specified in the JSON credentials file pointed by the `GOOGLE_APPLICATION_CREDENTIALS` environment variable
-4. App Engine project ID
+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
 

diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -383,10 +383,10 @@ protected String defaultHost() {
   protected String defaultProject() {
     String projectId = System.getProperty(PROJECT_ENV_NAME, System.getenv(PROJECT_ENV_NAME));
     if (projectId == null) {
-      projectId = serviceAccountProjectId();
+      projectId = appEngineProjectId();
     }
     if (projectId == null) {
-      projectId = appEngineProjectId();
+      projectId = serviceAccountProjectId();
     }
     return projectId != null ? projectId : googleCloudProjectId();
   }