X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fblueprint%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fblueprint%2FBlueprintBundleTracker.java;h=8812650aa681474e881c9ea39f7476671b85a1e3;hb=refs%2Fchanges%2F02%2F83802%2F42;hp=4d7780147caab1dbdf68cf37131dbc9dbc7f2981;hpb=bffaf3906c383141fe72cede16e9ea7d3306ea63;p=controller.git diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java index 4d7780147c..8812650aa6 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintBundleTracker.java @@ -7,6 +7,7 @@ */ package org.opendaylight.controller.blueprint; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -16,12 +17,14 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Hashtable; import java.util.List; -import javax.annotation.Nullable; import org.apache.aries.blueprint.NamespaceHandler; import org.apache.aries.blueprint.services.BlueprintExtenderService; import org.apache.aries.quiesce.participant.QuiesceParticipant; import org.apache.aries.util.AriesFrameworkUtil; +import org.eclipse.jdt.annotation.Nullable; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.controller.blueprint.ext.OpendaylightNamespaceHandler; +import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.osgi.framework.Bundle; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -50,7 +53,8 @@ import org.slf4j.LoggerFactory; public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCustomizer, BlueprintListener, SynchronousBundleListener { private static final Logger LOG = LoggerFactory.getLogger(BlueprintBundleTracker.class); - private static final String BLUEPRINT_FILE_PATH = "org/opendaylight/blueprint/"; + private static final String ODL_CUSTOM_BLUEPRINT_FILE_PATH = "org/opendaylight/blueprint/"; + private static final String STANDARD_BLUEPRINT_FILE_PATH = "OSGI-INF/blueprint/"; private static final String BLUEPRINT_FLE_PATTERN = "*.xml"; private static final long SYSTEM_BUNDLE_ID = 0; @@ -73,6 +77,9 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus public void start(final BundleContext context) { LOG.info("Starting {}", getClass().getSimpleName()); + // CONTROLLER-1867: force UntrustedXML initialization, so that it uses our TCCL to initialize + UntrustedXML.newDocumentBuilder(); + restartService = new BlueprintContainerRestartServiceImpl(); bundleContext = context; @@ -83,7 +90,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus bundleTracker = new BundleTracker<>(context, Bundle.ACTIVE, this); - blueprintExtenderServiceTracker = new ServiceTracker<>(context, BlueprintExtenderService.class.getName(), + blueprintExtenderServiceTracker = new ServiceTracker<>(context, BlueprintExtenderService.class, new ServiceTrackerCustomizer() { @Override public BlueprintExtenderService addingService( @@ -103,7 +110,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus }); blueprintExtenderServiceTracker.open(); - quiesceParticipantTracker = new ServiceTracker<>(context, QuiesceParticipant.class.getName(), + quiesceParticipantTracker = new ServiceTracker<>(context, QuiesceParticipant.class, new ServiceTrackerCustomizer() { @Override public QuiesceParticipant addingService( @@ -124,6 +131,8 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus quiesceParticipantTracker.open(); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private QuiesceParticipant onQuiesceParticipantAdded(final ServiceReference reference) { quiesceParticipant = reference.getBundle().getBundleContext().getService(reference); @@ -134,6 +143,8 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus return quiesceParticipant; } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private BlueprintExtenderService onBlueprintExtenderServiceAdded( final ServiceReference reference) { blueprintExtenderService = reference.getBundle().getBundleContext().getService(reference); @@ -145,21 +156,25 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus restartService.setBlueprintExtenderService(blueprintExtenderService); - blueprintContainerRestartReg = bundleContext.registerService( - BlueprintContainerRestartService.class.getName(), restartService, new Hashtable<>()); + blueprintContainerRestartReg = bundleContext.registerService(BlueprintContainerRestartService.class, + restartService, null); return blueprintExtenderService; } private void registerNamespaceHandler(final BundleContext context) { - Dictionary props = new Hashtable<>(); + Dictionary props = emptyDict(); props.put("osgi.service.blueprint.namespace", OpendaylightNamespaceHandler.NAMESPACE_1_0_0); - namespaceReg = context.registerService(NamespaceHandler.class.getName(), - new OpendaylightNamespaceHandler(), props); + namespaceReg = context.registerService(NamespaceHandler.class, new OpendaylightNamespaceHandler(), props); } private void registerBlueprintEventHandler(final BundleContext context) { - eventHandlerReg = context.registerService(BlueprintListener.class.getName(), this, new Hashtable<>()); + eventHandlerReg = context.registerService(BlueprintListener.class, this, null); + } + + @SuppressModernizer + private static Dictionary emptyDict() { + return new Hashtable<>(); } /** @@ -207,7 +222,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus } if (bundle.getState() == Bundle.ACTIVE) { - List paths = findBlueprintPaths(bundle); + List paths = findBlueprintPaths(bundle, ODL_CUSTOM_BLUEPRINT_FILE_PATH); if (!paths.isEmpty()) { LOG.info("Creating blueprint container for bundle {} with paths {}", bundle, paths); @@ -231,7 +246,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus * @param event the event to handle */ @Override - public void blueprintEvent(BlueprintEvent event) { + public void blueprintEvent(final BlueprintEvent event) { if (event.getType() == BlueprintEvent.CREATED) { LOG.info("Blueprint container for bundle {} was successfully created", event.getBundle()); return; @@ -254,9 +269,14 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus } } - @SuppressWarnings({ "rawtypes", "unchecked" }) static List findBlueprintPaths(final Bundle bundle) { - Enumeration rntries = bundle.findEntries(BLUEPRINT_FILE_PATH, BLUEPRINT_FLE_PATTERN, false); + List paths = findBlueprintPaths(bundle, STANDARD_BLUEPRINT_FILE_PATH); + return !paths.isEmpty() ? paths : findBlueprintPaths(bundle, ODL_CUSTOM_BLUEPRINT_FILE_PATH); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static List findBlueprintPaths(final Bundle bundle, final String path) { + Enumeration rntries = bundle.findEntries(path, BLUEPRINT_FLE_PATTERN, false); if (rntries == null) { return Collections.emptyList(); } else { @@ -308,7 +328,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus } if (!bundlesToDestroy.isEmpty()) { - Collections.sort(bundlesToDestroy, (b1, b2) -> (int) (b2.getLastModified() - b1.getLastModified())); + bundlesToDestroy.sort((b1, b2) -> (int) (b2.getLastModified() - b1.getLastModified())); LOG.debug("Selected bundles {} for destroy (no services in use)", bundlesToDestroy); } else { @@ -332,8 +352,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus return bundlesToDestroy; } - @Nullable - private Bundle findBundleWithHighestUsedServiceId(final Collection containerBundles) { + private @Nullable Bundle findBundleWithHighestUsedServiceId(final Collection containerBundles) { ServiceReference highestServiceRef = null; for (Bundle bundle : containerBundles) { ServiceReference[] references = bundle.getRegisteredServices();