Skip to content
Permalink
Browse files
fix: update GoogleUtils#getVersion() to use stable logic (#1452)
* fix: update GoogleUtils#getVersion() to use stable logic

* fix: fix property name

* fix: handle case where property is not found
  • Loading branch information
chingor13 committed Dec 17, 2019
1 parent b32a7d9 commit 744839f51a01301390297b4a5cb037547eefc4c0
Showing with 12 additions and 14 deletions.
  1. +12 −14 google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java
@@ -89,22 +89,20 @@ public static synchronized KeyStore getCertificateTrustStore()
}

private static String getVersion() {
String version = GoogleUtils.class.getPackage().getImplementationVersion();
// in a non-packaged environment (local), there's no implementation version to read
if (version == null) {
// fall back to reading from a properties file - note this value is expected to be cached
try (InputStream inputStream =
GoogleUtils.class.getResourceAsStream("google-api-client.properties")) {
if (inputStream != null) {
Properties properties = new Properties();
properties.load(inputStream);
version = properties.getProperty("google-api-client.version");
}
} catch (IOException e) {
// ignore
// attempt to read the library's version from a properties file generated during the build
// this value should be read and cached for later use
String version = null;
try (InputStream inputStream =
GoogleUtils.class.getResourceAsStream("google-api-client.properties")) {
if (inputStream != null) {
Properties properties = new Properties();
properties.load(inputStream);
version = properties.getProperty("google-api-client.version");
}
} catch (IOException e) {
// ignore
}
return version;
return version == null ? "unknown-version" : version;
}

private GoogleUtils() {}

0 comments on commit 744839f

Please sign in to comment.