Return-Path: <commits-return-17666-archive-asf-public=cust-asf.ponee.io@brooklyn.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 80570200D39
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri, 27 Oct 2017 13:26:09 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 7F391160BDC; Fri, 27 Oct 2017 11:26:09 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id A7C55160BF6
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 27 Oct 2017 13:26:08 +0200 (CEST)
Received: (qmail 71145 invoked by uid 500); 27 Oct 2017 11:26:07 -0000
Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@brooklyn.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@brooklyn.apache.org>
List-Post: <mailto:commits@brooklyn.apache.org>
List-Id: <commits.brooklyn.apache.org>
Reply-To: dev@brooklyn.apache.org
Delivered-To: mailing list commits@brooklyn.apache.org
Received: (qmail 71102 invoked by uid 99); 27 Oct 2017 11:26:07 -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; Fri, 27 Oct 2017 11:26:07 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 92928DFD45; Fri, 27 Oct 2017 11:26:06 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aledsage@apache.org
To: commits@brooklyn.apache.org
Date: Fri, 27 Oct 2017 11:26:12 -0000
Message-Id: <d6840baad9454238bd09a96aa4a844a6@git.apache.org>
In-Reply-To: <362469928b904835a2ef323d955d1787@git.apache.org>
References: <362469928b904835a2ef323d955d1787@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [7/9] brooklyn-server git commit: duplicate types in different
 bundles should be returned by `getAll()`
archived-at: Fri, 27 Oct 2017 11:26:09 -0000

duplicate types in different bundles should be returned by `getAll()`


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

Branch: refs/heads/master
Commit: 081212f9377eba37531166e8ef3ecda0c0a0e753
Parents: 856c1c9
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Oct 26 01:23:34 2017 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Oct 26 01:23:34 2017 +0100

----------------------------------------------------------------------
 .../core/typereg/BasicBrooklynTypeRegistry.java       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/081212f9/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java
index 663e6a5..46d3400 100644
--- a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java
+++ b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java
@@ -115,14 +115,17 @@ public class BasicBrooklynTypeRegistry implements BrooklynTypeRegistry {
     @SuppressWarnings("deprecation")
     @Override
     public Iterable<RegisteredType> getMatching(Predicate<? super RegisteredType> filter) {
-        Map<String,RegisteredType> result = MutableMap.of();
+        Set<RegisteredType> result = MutableSet.of();
+        // keep name record also so we can remove legacy items that are superseded
+        Set<String> typeNamesFound = MutableSet.of();
         for (RegisteredType rt: getAllWithoutCatalog(filter)) {
-            result.put(rt.getId(), rt);
+            result.add(rt);
+            typeNamesFound.add(rt.getId());
         }
         for (RegisteredType rt: Iterables.filter(
                 Iterables.transform(mgmt.getCatalog().getCatalogItemsLegacy(), RegisteredTypes.CI_TO_RT), 
                 filter)) {
-            if (!result.containsKey(rt.getId())) {
+            if (!typeNamesFound.contains(rt.getId())) {
                 // TODO ideally never come here, however
                 // legacy cataog currently still used for java-scanned annotations; 
                 // hopefully that will be deprecated and removed in near future
@@ -131,10 +134,11 @@ public class BasicBrooklynTypeRegistry implements BrooklynTypeRegistry {
                 // make TypeRegistry instances instead of CatalogItem, esp if we had YOML to write that plan)
                 
                 //log.warn("Item '"+rt.getId()+"' not in type registry; only found in legacy catalog");
-                result.put(rt.getId(), rt);
+                typeNamesFound.add(rt.getId());
+                result.add(rt);
             }
         }
-        return result.values();
+        return result;
     }
 
     @SuppressWarnings("deprecation")