aledsage commented on a change in pull request #1010: BROOKLYN-605 rebind fails for historic state URL: https://github.com/apache/brooklyn-server/pull/1010#discussion_r228573401
########## File path: core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogUpgradeScanner.java ########## @@ -0,0 +1,106 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.brooklyn.core.catalog.internal; + +import com.google.common.base.Predicate; +import org.apache.brooklyn.api.typereg.ManagedBundle; +import org.apache.brooklyn.api.typereg.OsgiBundleWithUrl; +import org.apache.brooklyn.api.typereg.RegisteredType; +import org.apache.brooklyn.core.mgmt.ha.OsgiManager; +import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; +import org.apache.brooklyn.core.typereg.BundleUpgradeParser.CatalogUpgrades; +import org.apache.brooklyn.util.guava.Maybe; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; + +import java.util.Collection; +import java.util.function.BiFunction; +import java.util.function.Function; + +/** + * Scans managed bundles and other jar bundles to find upgrades for installed bundles. + */ +class CatalogUpgradeScanner { + + private final ManagementContextInternal managementContext; + private final BiFunction<Bundle, RegisteredTypesSupplier, CatalogUpgrades> bundleUpgradeParser; + private final Function<OsgiBundleWithUrl, Predicate<? super RegisteredType>> managedBundlePredicateSupplier; + private final Function<String, Predicate<? super RegisteredType>> unmanagedBundlePredicateSupplier; + + CatalogUpgradeScanner( + final ManagementContextInternal managementContext, + final BiFunction<Bundle, RegisteredTypesSupplier, CatalogUpgrades> bundleUpgradeParser, + final Function<OsgiBundleWithUrl, Predicate<? super RegisteredType>> managedBundlePredicateSupplier, + final Function<String, Predicate<? super RegisteredType>> unmanagedBundlePredicateSupplier + ) { + this.managementContext = managementContext; + this.bundleUpgradeParser = bundleUpgradeParser; + this.managedBundlePredicateSupplier = managedBundlePredicateSupplier; + this.unmanagedBundlePredicateSupplier = unmanagedBundlePredicateSupplier; + } + + public CatalogUpgrades scan( + final OsgiManager osgiManager, + final BundleContext bundleContext, + final CatalogInitialization.RebindLogger rebindLogger + ) { + final CatalogUpgrades.Builder catalogUpgradesBuilder = CatalogUpgrades.builder(); + scanManagedBundles(osgiManager, catalogUpgradesBuilder, rebindLogger); + scanUnmanagedBundles(catalogUpgradesBuilder, bundleContext); + return catalogUpgradesBuilder.build(); + } + + private void scanManagedBundles( + final OsgiManager osgiManager, + final CatalogUpgrades.Builder catalogUpgradesBuilder, + final CatalogInitialization.RebindLogger rebindLogger + ) { + Collection<ManagedBundle> managedBundles = osgiManager.getManagedBundles().values(); + for (ManagedBundle managedBundle : managedBundles) { + Maybe<Bundle> bundle = osgiManager.findBundle(managedBundle); + if (bundle.isPresent()) { + CatalogUpgrades catalogUpgrades = bundleUpgradeParser.apply(bundle.get(), typeSupplier(managedBundle)); + catalogUpgradesBuilder.addAll(catalogUpgrades); + } else { + rebindLogger.info("Managed bundle "+managedBundle.getId()+" not found by OSGi Manager; " + + "ignoring when calculating persisted state catalog upgrades"); + } + } + } + + private void scanUnmanagedBundles( Review comment: Looks like this scans all bundles, rather than just the "unmanaged" bundles. That's ok, I think, but might want to reflect that in the method name (e.g. `scanAllBundles()`) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
