You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/05/23 16:51:39 UTC
[08/50] [abbrv] git commit: Updated following PR review
Updated following PR review
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6f338897
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6f338897
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6f338897
Branch: refs/pull/1385/merge
Commit: 6f338897b704b1db1b88ec5cd9c1522e39ba2f08
Parents: 238780f
Author: Martin Harris <gi...@nakomis.com>
Authored: Thu May 22 10:47:42 2014 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Thu May 22 10:47:42 2014 +0100
----------------------------------------------------------------------
.../brooklyn/entity/group/AbstractMembershipTrackingPolicy.java | 5 ++---
.../src/main/java/brooklyn/util/collections/MutableSet.java | 3 ---
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f338897/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java b/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java
index 99fd2b5..049d49c 100644
--- a/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java
+++ b/core/src/main/java/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java
@@ -20,7 +20,6 @@ import brooklyn.event.SensorEvent;
import brooklyn.event.SensorEventListener;
import brooklyn.policy.basic.AbstractPolicy;
import brooklyn.util.collections.MutableMap;
-import brooklyn.util.collections.MutableSet;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -55,10 +54,10 @@ public abstract class AbstractMembershipTrackingPolicy extends AbstractPolicy {
}
protected Set<Sensor<?>> getSensorsToTrack() {
- return MutableSet.<Sensor<?>>builder()
+ return ImmutableSet.<Sensor<?>>builder()
.addAll(getRequiredConfig(SENSORS_TO_TRACK))
.add(Attributes.SERVICE_UP)
- .buildImmutable();
+ .build();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f338897/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java b/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java
index 6ab967a..f791949 100644
--- a/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java
+++ b/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java
@@ -111,9 +111,6 @@ public class MutableSet<V> extends LinkedHashSet<V> {
return new MutableSet<V>(result);
}
- public ImmutableSet<V> buildImmutable() {
- return ImmutableSet.copyOf(result);
- }
}
public boolean addIfNotNull(V e) {