Make defaultLibraryVersion() more robust (#1436)

shinfan · web-flow · commit 15e2e2d7ca21 · 2016-12-01T14:38:29.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
@@ -48,6 +48,7 @@
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.Properties;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.jar.Attributes;
@@ -72,12 +73,15 @@ 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 = "gcloud-java";
+  private static final String LIBRARY_NAME = "google-cloud-java";
   private static final String LIBRARY_VERSION = defaultLibraryVersion();
   private static final String APPLICATION_NAME =
       LIBRARY_VERSION == null ? LIBRARY_NAME : LIBRARY_NAME + "/" + LIBRARY_VERSION;
   private static final long serialVersionUID = -5714029257168617973L;
 
+  private static final String META_FILE_ROOT = "/META-INF/maven/";
+  private static final String META_VERSION_KEY = "version";
+
   private final String projectId;
   private final String host;
   private final RetryParams retryParams;
@@ -566,30 +570,30 @@ public Clock getClock() {
   }
 
   /**
-   * Returns the application's name as a string in the format {@code gcloud-java/[version]}.
+   * Returns the application's name as a string in the format {@code google-cloud-java/[version]}.
    */
   @Deprecated
   public String applicationName() {
     return getApplicationName();
   }
 
   /**
-   * Returns the application's name as a string in the format {@code gcloud-java/[version]}.
+   * Returns the application's name as a string in the format {@code google-cloud-java/[version]}.
    */
   public String getApplicationName() {
     return APPLICATION_NAME;
   }
 
   /**
-   * Returns the library's name, {@code gcloud-java}, as a string.
+   * Returns the library's name, {@code google-cloud-java}, as a string.
    */
   @Deprecated
   public String libraryName() {
     return getLibraryName();
   }
 
   /**
-   * Returns the library's name, {@code gcloud-java}, as a string.
+   * Returns the library's name, {@code google-cloud-java}, as a string.
    */
   public String getLibraryName() {
     return LIBRARY_NAME;
@@ -676,6 +680,31 @@ static <T> T getFromServiceLoader(Class<? extends T> clazz, T defaultInstance) {
   }
 
   private static String defaultLibraryVersion() {
+    String version = getPomVersion();
+    if (version == null) {
+      version = getManifestVersion();
+    }
+    return version;
+  }
+
+  private static String getPomVersion() {
+    try {
+      Properties properties = new Properties();
+      String mavenPropertiesPath = META_FILE_ROOT
+          + ServiceOptions.class.getPackage().getName() + "/"
+          + ARTIFACT_ID + "/pom.properties";
+      InputStream inputStream = ServiceOptions.class.getResourceAsStream(mavenPropertiesPath);
+      if (inputStream != null) {
+        properties.load(inputStream);
+        return properties.getProperty(META_VERSION_KEY, "");
+      }
+    } catch (Exception e) {
+      // ignore
+    }
+    return null;
+  }
+
+  private static String getManifestVersion() {
     String version = null;
     try {
       Enumeration<URL> resources =
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 = "gcloud-java";
+  private static final String LIBRARY_NAME = "google-cloud-java";
   private static final Pattern APPLICATION_NAME_PATTERN =
       Pattern.compile(LIBRARY_NAME + "(/[0-9]+.[0-9]+.[0-9]+)?");
 
