Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C2DB117853 for ; Thu, 29 Jan 2015 11:36:10 +0000 (UTC) Received: (qmail 29445 invoked by uid 500); 29 Jan 2015 11:36:11 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 29423 invoked by uid 500); 29 Jan 2015 11:36:11 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 29414 invoked by uid 99); 29 Jan 2015 11:36:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Jan 2015 11:36:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 29 Jan 2015 11:35:48 +0000 Received: (qmail 27561 invoked by uid 99); 29 Jan 2015 11:35:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Jan 2015 11:35:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 01789E03EC; Thu, 29 Jan 2015 11:35:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Thu, 29 Jan 2015 11:35:45 -0000 Message-Id: In-Reply-To: <94d119ccf05e4b7a8f49b89461d21f97@git.apache.org> References: <94d119ccf05e4b7a8f49b89461d21f97@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] incubator-brooklyn git commit: use better EntityConfigMap.filterUninherited method, from @aledsage code review X-Virus-Checked: Checked by ClamAV on apache.org use better EntityConfigMap.filterUninherited method, from @aledsage code 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/9613dd11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9613dd11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9613dd11 Branch: refs/heads/master Commit: 9613dd11b07d69a8f30145d16ce2d255c22ede20 Parents: 2939e80 Author: Alex Heneveld Authored: Thu Jan 29 11:33:46 2015 +0000 Committer: Alex Heneveld Committed: Thu Jan 29 11:34:34 2015 +0000 ---------------------------------------------------------------------- .../brooklyn/entity/basic/EntityConfigMap.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9613dd11/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java b/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java index dd7a933..c4efe7c 100644 --- a/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java +++ b/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java @@ -22,7 +22,6 @@ import static brooklyn.util.GroovyJavaMethods.elvis; import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collections; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -38,7 +37,6 @@ import brooklyn.config.ConfigMap; import brooklyn.event.basic.StructuredConfigKey; import brooklyn.management.ExecutionContext; import brooklyn.management.Task; -import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.flags.FlagUtils; @@ -298,19 +296,16 @@ public class EntityConfigMap implements ConfigMap { } } - private Map, ?> filterUninheritable(Map, ?> valsO) { - MutableMap, Object> result = MutableMap.copyOf(valsO); - MutableList> keys = MutableList.copyOf(result.keySet()); - Iterator> ki = keys.iterator(); - while (ki.hasNext()) { - ConfigKey key = ki.next(); - if (isInherited(key)) ki.remove(); + private Map, ?> filterUninheritable(Map, ?> vals) { + Map, Object> result = Maps.newLinkedHashMap(); + for (Map.Entry, ?> entry : vals.entrySet()) { + if (isInherited(entry.getKey())) { + result.put(entry.getKey(), entry.getValue()); + } } - for (ConfigKey k: keys) - result.remove(k); return result; } - + public void addToLocalBag(Map vals) { localConfigBag.putAll(vals); // quick fix for problem that ownConfig can get out of synch