jclouds / os-creds review comments addressed
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ce458d5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ce458d5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ce458d5b Branch: refs/heads/master Commit: ce458d5b30a8e1d0daa050fe0d891648780a3fd6 Parents: bdf6b1e Author: Alex Heneveld <[email protected]> Authored: Fri Jan 23 18:12:35 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Fri Jan 23 18:12:59 2015 +0000 ---------------------------------------------------------------------- .../main/java/brooklyn/location/basic/LocationConfigUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ce458d5b/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java b/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java index 5e5b6e8..cae2edd 100644 --- a/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java +++ b/core/src/main/java/brooklyn/location/basic/LocationConfigUtils.java @@ -50,6 +50,7 @@ import brooklyn.util.os.Os; import brooklyn.util.text.StringFunctions; import brooklyn.util.text.Strings; +import com.google.common.annotations.Beta; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -71,6 +72,7 @@ public class LocationConfigUtils { /** Convenience class for holding private/public keys and passwords, inferring from config keys. * See {@link LocationConfigUtils#getOsCredential(ConfigBag)}. */ + @Beta // would be nice to replace with a builder pattern public static class OsCredential { private final ConfigBag config; private boolean preferPassword = false; @@ -357,8 +359,8 @@ public class LocationConfigUtils { @Override public String toString() { return getClass().getSimpleName()+"["+ - (Strings.isNonBlank(publicKeyData) ? publicKeyData : "public-key")+";"+ - (Strings.isNonBlank(privateKeyData) ? "private-key" : "private-key")+","+ + (Strings.isNonBlank(publicKeyData) ? publicKeyData : "no-public-key")+";"+ + (Strings.isNonBlank(privateKeyData) ? "private-key-present" : "no-private-key")+","+ (password!=null ? "password(len="+password.length()+")" : "no-password")+"]"; } }
