Repository: brooklyn-server Updated Branches: refs/heads/master 48f090071 -> aa43a5feb
Stop memberSpecs being inherited Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/09b9cda3 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/09b9cda3 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/09b9cda3 Branch: refs/heads/master Commit: 09b9cda37f92a62216ac69ac6c30b178e522a104 Parents: 84e9e19 Author: Duncan Godwin <duncan.god...@cloudsoftcorp.com> Authored: Fri Nov 3 11:46:18 2017 +0000 Committer: Duncan Godwin <duncan.god...@cloudsoftcorp.com> Committed: Fri Nov 3 11:48:01 2017 +0000 ---------------------------------------------------------------------- .../brooklyn/entity/group/DynamicCluster.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/09b9cda3/core/src/main/java/org/apache/brooklyn/entity/group/DynamicCluster.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicCluster.java b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicCluster.java index 2be07b0..417a014 100644 --- a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicCluster.java +++ b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicCluster.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.annotation.Effector; import org.apache.brooklyn.core.annotation.EffectorParam; +import org.apache.brooklyn.core.config.BasicConfigInheritance; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.effector.MethodEffector; import org.apache.brooklyn.core.entity.Attributes; @@ -138,16 +139,18 @@ public interface DynamicCluster extends AbstractGroup, Cluster, MemberReplaceabl @CatalogConfig(label = "Member spec") @SetFromFlag("memberSpec") - ConfigKey<EntitySpec<?>> MEMBER_SPEC = ConfigKeys.newConfigKey( - new TypeToken<EntitySpec<?>>() { }, - "dynamiccluster.memberspec", "entity spec for creating new cluster members", null); + ConfigKey<EntitySpec<?>> MEMBER_SPEC = ConfigKeys.builder(new TypeToken<EntitySpec<?>>(){}, "dynamiccluster.memberspec") + .description("entity spec for creating new cluster members") + .defaultValue(null) + .runtimeInheritance(BasicConfigInheritance.NOT_REINHERITED) + .build(); @SetFromFlag("firstMemberSpec") - ConfigKey<EntitySpec<?>> FIRST_MEMBER_SPEC = ConfigKeys.newConfigKey( - new TypeToken<EntitySpec<?>>() { }, - "dynamiccluster.firstmemberspec", - "entity spec for creating the first member of the cluster (if unset, will use the member spec for all)", - null); + ConfigKey<EntitySpec<?>> FIRST_MEMBER_SPEC = ConfigKeys.builder(new TypeToken<EntitySpec<?>>(){}, "dynamiccluster.firstmemberspec") + .description("entity spec for creating the first member of the cluster (if unset, will use the member spec for all)") + .defaultValue(null) + .runtimeInheritance(BasicConfigInheritance.NOT_REINHERITED) + .build(); @SetFromFlag("removalStrategy") ConfigKey<Function<Collection<Entity>, Entity>> REMOVAL_STRATEGY = ConfigKeys.newConfigKey(
