Add convenience for templated ConfigKeys
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1c757e3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1c757e3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1c757e3d Branch: refs/heads/master Commit: 1c757e3d17d095a0cccb5c2ecb4e9f8d63221f7f Parents: d3f35a7 Author: Andrew Kennedy <[email protected]> Authored: Mon Mar 23 16:35:30 2015 +0000 Committer: Andrew Kennedy <[email protected]> Committed: Tue Mar 24 14:34:22 2015 +0000 ---------------------------------------------------------------------- core/src/main/java/brooklyn/entity/basic/ConfigKeys.java | 9 +++++++++ .../src/main/java/brooklyn/entity/nosql/riak/RiakNode.java | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1c757e3d/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java b/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java index 072dd93..85b83dc 100644 --- a/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java +++ b/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java @@ -29,6 +29,7 @@ import brooklyn.config.ConfigKey; import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey; +import brooklyn.event.basic.TemplatedStringAttributeSensorAndConfigKey; import brooklyn.event.basic.BasicConfigKey.BasicConfigKeyOverwriting; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.util.config.ConfigBag; @@ -95,6 +96,14 @@ public class ConfigKeys { return new BasicAttributeSensorAndConfigKey.StringAttributeSensorAndConfigKey(name, description, defaultValue); } + public static AttributeSensorAndConfigKey<String,String> newTemplateSensorAndConfigKey(String name, String description) { + return new TemplatedStringAttributeSensorAndConfigKey(name, description); + } + + public static AttributeSensorAndConfigKey<String,String> newTemplateSensorAndConfigKey(String name, String description, String defaultValue) { + return new TemplatedStringAttributeSensorAndConfigKey(name, description, defaultValue); + } + public static AttributeSensorAndConfigKey<Integer,Integer> newIntegerSensorAndConfigKey(String name, String description) { return new BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey(name, description); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1c757e3d/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java index c1f1bf8..a291170 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java @@ -69,25 +69,25 @@ public interface RiakNode extends SoftwareProcess { "classpath://brooklyn/entity/nosql/riak/riak-mac.conf"); @SetFromFlag("downloadUrlRhelCentos") - AttributeSensorAndConfigKey DOWNLOAD_URL_RHEL_CENTOS = new TemplatedStringAttributeSensorAndConfigKey("download.url.rhelcentos", + AttributeSensorAndConfigKey<String, String> DOWNLOAD_URL_RHEL_CENTOS = ConfigKeys.newTemplateSensorAndConfigKey("download.url.rhelcentos", "URL pattern for downloading the linux RPM installer (will substitute things like ${version} automatically)", "http://s3.amazonaws.com/downloads.basho.com/riak/${entity.majorVersion}/${entity.fullVersion}/rhel/"; + "${entity.osMajorVersion}/riak-${entity.fullVersion}-1.el${entity.osMajorVersion}.x86_64.rpm"); @SetFromFlag("downloadUrlUbuntu") - AttributeSensorAndConfigKey DOWNLOAD_URL_UBUNTU = new TemplatedStringAttributeSensorAndConfigKey("download.url.ubuntu", + AttributeSensorAndConfigKey<String, String> DOWNLOAD_URL_UBUNTU = ConfigKeys.newTemplateSensorAndConfigKey("download.url.ubuntu", "URL pattern for downloading the linux Ubuntu installer (will substitute things like ${version} automatically)", "http://s3.amazonaws.com/downloads.basho.com/riak/${entity.majorVersion}/${entity.fullVersion}/ubuntu/"; + "$OS_RELEASE/riak_${entity.fullVersion}-1_amd64.deb"); @SetFromFlag("downloadUrlDebian") - AttributeSensorAndConfigKey DOWNLOAD_URL_DEBIAN = new TemplatedStringAttributeSensorAndConfigKey("download.url.debian", + AttributeSensorAndConfigKey<String, String> DOWNLOAD_URL_DEBIAN = ConfigKeys.newTemplateSensorAndConfigKey("download.url.debian", "URL pattern for downloading the linux Debian installer (will substitute things like ${version} automatically)", "http://s3.amazonaws.com/downloads.basho.com/riak/${entity.majorVersion}/${entity.fullVersion}/debian/"; + "$OS_RELEASE/riak_${entity.fullVersion}-1_amd64.deb"); @SetFromFlag("downloadUrlMac") - AttributeSensorAndConfigKey DOWNLOAD_URL_MAC = new TemplatedStringAttributeSensorAndConfigKey("download.url.mac", + AttributeSensorAndConfigKey<String, String> DOWNLOAD_URL_MAC = ConfigKeys.newTemplateSensorAndConfigKey("download.url.mac", "URL pattern for downloading the MAC binaries tarball (will substitute things like ${version} automatically)", "http://s3.amazonaws.com/downloads.basho.com/riak/${entity.majorVersion}/${entity.fullVersion}/osx/10.8/riak-${entity.fullVersion}-OSX-x86_64.tar.gz";);
