Add new env variable for project, change namespace for datastore example

mziccard · mziccard · commit f9cca55771d1 · 2016-08-30T23:19:17.000+02:00
diff --git a/README.md b/README.md
@@ -95,7 +95,7 @@ Most `google-cloud` libraries require a project ID.  There are multiple ways to
   ```java
   Datastore datastore = DatastoreOptions.builder().projectId("PROJECT_ID").build().service(); 
   ```
-  * Specify the environment variable `GCLOUD_PROJECT` to be your desired project ID.
+  * Specify the environment variable `GOOGLE_CLOUD_PROJECT` to be your desired project ID.
   * Set the project ID using the [Google Cloud SDK](https://cloud.google.com/sdk/?hl=en).  To use the SDK, [download the SDK](https://cloud.google.com/sdk/?hl=en) if you haven't already, and set the project ID from the command line.  For example:
 
   ```
@@ -105,7 +105,7 @@ 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
-2. Project ID specified by the environment variable `GCLOUD_PROJECT`
+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
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -64,10 +64,11 @@ public abstract class ServiceOptions<ServiceT extends Service<OptionsT>, Service
     OptionsT extends ServiceOptions<ServiceT, ServiceRpcT, OptionsT>> implements Serializable {
 
   private static final String DEFAULT_HOST = "https://www.googleapis.com";
-  private static final String PROJECT_ENV_NAME = "GCLOUD_PROJECT";
+  private static final String LEGACY_PROJECT_ENV_NAME = "GCLOUD_PROJECT";
+  private static final String PROJECT_ENV_NAME = "GOOGLE_CLOUD_PROJECT";
   private static final String MANIFEST_ARTIFACT_ID_KEY = "artifactId";
   private static final String MANIFEST_VERSION_KEY = "Implementation-Version";
-  private static final String ARTIFACT_ID = "gcloud-java-core";
+  private static final String ARTIFACT_ID = "google-cloud-core";
   private static final String LIBRARY_NAME = "gcloud-java";
   private static final String LIBRARY_VERSION = getLibraryVersion();
   private static final String APPLICATION_NAME =
@@ -261,6 +262,10 @@ protected String defaultHost() {
 
   protected String defaultProject() {
     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();
     }
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java
@@ -53,7 +53,7 @@ public class DatastoreExample {
 
   private static final String USER_KIND = "_DS_EXAMPLE_USER";
   private static final String COMMENT_KIND = "_DS_EXAMPLE_COMMENT";
-  private static final String NAMESPACE = "gcloud_java_example";
+  private static final String NAMESPACE = "google_cloud_example";
   private static final String DEFAULT_ACTION = "display";
   private static final Map<String, DatastoreAction> ACTIONS = new HashMap<>();
 
