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

mziccard · mziccard · commit cf6ac54e46b5 · 2016-04-04T17:43:09.000+02:00
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();
   }

Original file line number	Diff line number	Diff line change
`@@ -383,10 +383,10 @@ protected String defaultHost() {`
`383`	`383`	`protected String defaultProject() {`
`384`	`384`	`String projectId = System.getProperty(PROJECT_ENV_NAME, System.getenv(PROJECT_ENV_NAME));`
`385`	`385`	`if (projectId == null) {`
`386`		`- projectId = serviceAccountProjectId();`
	`386`	`+ projectId = appEngineProjectId();`
`387`	`387`	`}`
`388`	`388`	`if (projectId == null) {`
`389`		`- projectId = appEngineProjectId();`
	`389`	`+ projectId = serviceAccountProjectId();`
`390`	`390`	`}`
`391`	`391`	`return projectId != null ? projectId : googleCloudProjectId();`
`392`	`392`	`}`