Revert library name to gcloud-java (#1444)

shinfan · web-flow · commit 0d9d1b3ce548 · 2016-12-05T12:57:48.000-08:00
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
@@ -73,7 +73,7 @@ public abstract class ServiceOptions<ServiceT extends Service<OptionsT>, Service
   private static final String MANIFEST_ARTIFACT_ID_KEY = "artifactId";
   private static final String MANIFEST_VERSION_KEY = "Implementation-Version";
   private static final String ARTIFACT_ID = "google-cloud-core";
-  private static final String LIBRARY_NAME = "google-cloud-java";
+  private static final String LIBRARY_NAME = "gcloud-java";
   private static final String LIBRARY_VERSION = defaultLibraryVersion();
   private static final String APPLICATION_NAME =
       LIBRARY_VERSION == null ? LIBRARY_NAME : LIBRARY_NAME + "/" + LIBRARY_VERSION;
@@ -570,30 +570,30 @@ public Clock getClock() {
   }
 
   /**
-   * Returns the application's name as a string in the format {@code google-cloud-java/[version]}.
+   * Returns the application's name as a string in the format {@code gcloud-java/[version]}.
    */
   @Deprecated
   public String applicationName() {
     return getApplicationName();
   }
 
   /**
-   * Returns the application's name as a string in the format {@code google-cloud-java/[version]}.
+   * Returns the application's name as a string in the format {@code gcloud-java/[version]}.
    */
   public String getApplicationName() {
     return APPLICATION_NAME;
   }
 
   /**
-   * Returns the library's name, {@code google-cloud-java}, as a string.
+   * Returns the library's name, {@code gcloud-java}, as a string.
    */
   @Deprecated
   public String libraryName() {
     return getLibraryName();
   }
 
   /**
-   * Returns the library's name, {@code google-cloud-java}, as a string.
+   * Returns the library's name, {@code gcloud-java}, as a string.
    */
   public String getLibraryName() {
     return LIBRARY_NAME;
diff --git a/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java b/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java
@@ -102,7 +102,7 @@ public class ServiceOptionsTest {
   private static final TestServiceOptions DEPRECATED_DEFAULT_OPTIONS =
       TestServiceOptions.newBuilder().projectId("project-id").build();
   private static final TestServiceOptions OPTIONS_COPY = OPTIONS.toBuilder().build();
-  private static final String LIBRARY_NAME = "google-cloud-java";
+  private static final String LIBRARY_NAME = "gcloud-java";
   private static final Pattern APPLICATION_NAME_PATTERN =
       Pattern.compile(LIBRARY_NAME + "(/[0-9]+.[0-9]+.[0-9]+)?");
 
