brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grk...@apache.org
Subject [1/2] incubator-brooklyn git commit: deprecate group.members.delegate and prevent delegate creation when adding to quarantine - use of delegate to denote quarantine group membership in the jsgui is no longer required due to #929
Date Mon, 18 Jan 2016 00:37:26 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master f7cf0bc20 -> 209c0ad8c


deprecate group.members.delegate and prevent delegate creation when adding to quarantine
- use of delegate to denote quarantine group membership in the jsgui is no longer required
due to #929


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f0e40703
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f0e40703
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f0e40703

Branch: refs/heads/master
Commit: f0e4070343a768fe766d9251edbd90253d48fef7
Parents: d058158
Author: John McCabe <john@johnmccabe.net>
Authored: Wed Jan 13 15:54:01 2016 +0000
Committer: John McCabe <john@johnmccabe.net>
Committed: Wed Jan 13 15:54:01 2016 +0000

----------------------------------------------------------------------
 .../java/org/apache/brooklyn/entity/group/AbstractGroup.java   | 6 +++++-
 .../org/apache/brooklyn/entity/group/AbstractGroupImpl.java    | 1 +
 .../java/org/apache/brooklyn/entity/group/QuarantineGroup.java | 2 --
 3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f0e40703/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroup.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroup.java
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroup.java
index aa9ca90..625d981 100644
--- a/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroup.java
+++ b/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroup.java
@@ -58,8 +58,12 @@ public interface AbstractGroup extends Entity, Group, Changeable {
     AttributeSensor<Entity> FIRST = Sensors.newSensor(Entity.class,
             "cluster.first.entity", "The first member of the cluster");
 
+    /**
+     * @deprecated since 0.9.0, the UI no longer relies on the use of delegates to represent
group membership (see #929)
+     */
+    @Deprecated
     ConfigKey<Boolean> MEMBER_DELEGATE_CHILDREN = ConfigKeys.newBooleanConfigKey(
-            "group.members.delegate", "Add delegate child entities for members of the group",
Boolean.FALSE);
+            "group.members.delegate", "Deprecated: Add delegate child entities for members
of the group", Boolean.FALSE);
 
     ConfigKey<String> MEMBER_DELEGATE_NAME_FORMAT = ConfigKeys.newStringConfigKey(
             "group.members.delegate.nameFormat", "Delegate members name format string (Use
%s for the original entity display name)", "%s");

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f0e40703/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroupImpl.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroupImpl.java
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroupImpl.java
index d8814bd..bfd366f 100644
--- a/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroupImpl.java
+++ b/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/AbstractGroupImpl.java
@@ -146,6 +146,7 @@ public abstract class AbstractGroupImpl extends AbstractEntity implements
Abstra
                 sensors().emit(MEMBER_ADDED, member);
 
                 if (Boolean.TRUE.equals(getConfig(MEMBER_DELEGATE_CHILDREN))) {
+                    log.warn("Use of deprecated ConfigKey {} in {} (as of 0.9.0)", MEMBER_DELEGATE_CHILDREN.getName(),
this);
                     Optional<Entity> result = Iterables.tryFind(getChildren(), Predicates.equalTo(member));
                     if (!result.isPresent()) {
                         String nameFormat = Optional.fromNullable(getConfig(MEMBER_DELEGATE_NAME_FORMAT)).or("%s");

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f0e40703/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/QuarantineGroup.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/QuarantineGroup.java
b/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/QuarantineGroup.java
index e6f2aab..c13d914 100644
--- a/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/QuarantineGroup.java
+++ b/brooklyn-server/core/src/main/java/org/apache/brooklyn/entity/group/QuarantineGroup.java
@@ -27,8 +27,6 @@ import org.apache.brooklyn.core.config.ConfigKeys;
 @ImplementedBy(QuarantineGroupImpl.class)
 public interface QuarantineGroup extends AbstractGroup {
 
-    ConfigKey<Boolean> MEMBER_DELEGATE_CHILDREN = ConfigKeys.newConfigKeyWithDefault(AbstractGroup.MEMBER_DELEGATE_CHILDREN,
Boolean.TRUE);
-
     @Effector(description="Removes all members of the quarantined group, unmanaging them")
     void expungeMembers(
             @EffectorParam(name="firstStop", description="Whether to first call stop() on
those members that are stoppable") boolean stopFirst);


Mime
View raw message