Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: update GoogleUtils#getVersion() to use stable logic #1452

Merged
merged 3 commits into from Dec 17, 2019
Merged

fix: update GoogleUtils#getVersion() to use stable logic #1452

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d00032
fix: update GoogleUtils#getVersion() to use stable logic
chingor13 Dec 17, 2019
0d3dfd9
fix: fix property name
chingor13 Dec 17, 2019
1cc4b3d
fix: handle case where property is not found
chingor13 Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 12 additions & 14 deletions google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java
View file
Open in desktop
Expand Up @@ -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");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could be null. You should supply a default here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Moved the default to the return statement while checking for null.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or you could write

version = properties.getProperty("google-api-client.version". "unknown-version");

up to you.

}
} catch (IOException e) {
// ignore
chingor13 marked this conversation as resolved.
Show resolved Hide resolved
}
return version;
return version == null ? "unknown-version" : version;
}

private GoogleUtils() {}
Expand Down