[brooklyn-server] 21/31: Extract overloaded typeSupplier() helpers

[aledsage]

This is an automated email from the ASF dual-hosted git repository.

aledsage pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git

commit 0fc25b22589e9af0e5f825f07fb477c7d6bd96e2
Author: Paul Campbell <pcampb...@kemitix.net>
AuthorDate: Wed Oct 24 10:48:39 2018 +0100

    Extract overloaded typeSupplier() helpers
---
 .../core/catalog/internal/CatalogUpgradeScanner.java   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git 
a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScanner.java
 
b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScanner.java
index afb181f..342e3af 100644
--- 
a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScanner.java
+++ 
b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScanner.java
@@ -64,8 +64,7 @@ class CatalogUpgradeScanner {
             Maybe<Bundle> bundle = osgiManager.findBundle(managedBundle);
             if (bundle.isPresent()) {
                 CatalogUpgrades catalogUpgrades = 
BundleUpgradeParser.parseBundleManifestForCatalogUpgrades(
-                        bundle.get(),
-                        new RegisteredTypesSupplier(managementContext, 
RegisteredTypePredicates.containingBundle(managedBundle)));
+                        bundle.get(), typeSupplier(managedBundle));
                 catalogUpgradesBuilder.addAll(catalogUpgrades);
             } else {
                 rebindLogger.info("Managed bundle "+managedBundle.getId()+" 
not found by OSGi Manager; "
@@ -79,13 +78,20 @@ class CatalogUpgradeScanner {
             final CatalogUpgrades.Builder catalogUpgradesBuilder
     ) {
         for (Bundle bundle : 
osgiManager.getFramework().getBundleContext().getBundles()) {
-            final RegisteredTypesSupplier typeSupplier =
-                    new RegisteredTypesSupplier(managementContext,
-                            
RegisteredTypePredicates.containingBundle(bundle.getSymbolicName()));
             final CatalogUpgrades catalogUpgrades =
-                    
BundleUpgradeParser.parseBundleManifestForCatalogUpgrades(bundle, typeSupplier);
+                    
BundleUpgradeParser.parseBundleManifestForCatalogUpgrades(bundle, 
typeSupplier(bundle));
             catalogUpgradesBuilder.addAll(catalogUpgrades);
         }
     }
 
+    private RegisteredTypesSupplier typeSupplier(final ManagedBundle 
managedBundle) {
+        return new RegisteredTypesSupplier(managementContext,
+                RegisteredTypePredicates.containingBundle(managedBundle));
+    }
+
+    private RegisteredTypesSupplier typeSupplier(final Bundle bundle) {
+        return new RegisteredTypesSupplier(managementContext,
+                
RegisteredTypePredicates.containingBundle(bundle.getSymbolicName()));
+    }
+
 }