From: Tom Pantelis Date: Thu, 14 Apr 2016 15:56:01 +0000 (-0400) Subject: Address comments in prior patches X-Git-Tag: release/boron~203 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=762f30c90106b79a775478f0485e0db76ea361ff Address comments in prior patches Follow-up patch to address comments in https://git.opendaylight.org/gerrit/#/c/36476/ and https://git.opendaylight.org/gerrit/#/c/36485/. Change-Id: Ic4e9c4957a3440c8772fe814a3f4732c054b3271 Signed-off-by: Tom Pantelis --- diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java index 3e04f21349..107ea39c1c 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java @@ -7,6 +7,7 @@ */ package org.opendaylight.controller.blueprint; +import com.google.common.collect.Lists; import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -20,7 +21,8 @@ import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** Implementation of the BlueprintContainerRestartService. +/** + * Implementation of the BlueprintContainerRestartService. * * @author Thomas Pantelis */ @@ -49,6 +51,7 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo } private void restartContainerAndDependentsInternal(Bundle forBundle) { + // We use a LinkedHashSet to preserve insertion order as we walk the service usage hierarchy. Set containerBundlesSet = new LinkedHashSet<>(); findDependentContainersRecursively(forBundle, containerBundlesSet); @@ -58,8 +61,7 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo containerBundles.subList(1, containerBundles.size())); // Destroy the containers in reverse order with 'forBundle' last, ie bottom-up in the service tree. - for(int i = containerBundles.size() - 1; i >= 0; i--) { - Bundle bundle = containerBundles.get(i); + for(Bundle bundle: Lists.reverse(containerBundles)) { blueprintExtenderService.destroyContainer(bundle, blueprintExtenderService.getContainer(bundle)); } @@ -81,11 +83,11 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo * @param containerBundles the current set of bundles containing blueprint containers */ private void findDependentContainersRecursively(Bundle bundle, Set containerBundles) { - if(containerBundles.contains(bundle)) { + if(!containerBundles.add(bundle)) { + // Already seen this bundle... return; } - containerBundles.add(bundle); ServiceReference[] references = bundle.getRegisteredServices(); if (references != null) { for (ServiceReference reference : references) { diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java index bae06b1ea6..a4b63aa427 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java @@ -128,7 +128,7 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor } private void registerManagedService(final String persistentId) { - // Register a ManagedService so we git updates from the ConfigAdmin when the cfg file corresponding + // Register a ManagedService so we get updates from the ConfigAdmin when the cfg file corresponding // to the persistentId changes. ManagedService managedService = new ManagedService() { private volatile boolean initialUpdate = true; diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/NotificationListenerBean.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/NotificationListenerBean.java index bdef13f59c..c0931f32c2 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/NotificationListenerBean.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/NotificationListenerBean.java @@ -40,7 +40,6 @@ public class NotificationListenerBean { this.bundle = bundle; } - @SuppressWarnings({ }) public void init() { LOG.debug("{}: init - registering NotificationListener {}", bundle.getSymbolicName(), notificationListener); @@ -49,7 +48,10 @@ public class NotificationListenerBean { public void destroy() { if(registration != null) { + LOG.debug("{}: destroy - closing ListenerRegistration {}", bundle.getSymbolicName(), notificationListener); registration.close(); + } else { + LOG.debug("{}: destroy - listener was not registered", bundle.getSymbolicName()); } } } diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java index 297c3d4484..80417e8bd0 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/OpendaylightNamespaceHandler.java @@ -181,7 +181,7 @@ public class OpendaylightNamespaceHandler implements NamespaceHandler { LOG.debug("{}: {}", propertyName, attr.getValue()); - if(!Boolean.TRUE.equals(Boolean.valueOf(attr.getValue()))) { + if(!Boolean.parseBoolean(attr.getValue())) { return component; } diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RoutedRpcMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RoutedRpcMetadata.java index 4b71d92e57..7bf559ea4c 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RoutedRpcMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RoutedRpcMetadata.java @@ -105,7 +105,7 @@ class RoutedRpcMetadata implements ComponentFactoryMetadata { public void destroy(Object instance) { LOG.debug("{}: In destroy: instance: {}", logName(), instance); - (( RoutedRpcRegistration)instance).close(); + ((RoutedRpcRegistration)instance).close(); } private String logName() { diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RoutedRpcRegistrationConverter.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RoutedRpcRegistrationConverter.java index acc6a01d4a..7daf7febf6 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RoutedRpcRegistrationConverter.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RoutedRpcRegistrationConverter.java @@ -28,7 +28,7 @@ public class RoutedRpcRegistrationConverter implements Converter { } @Override - public Object convert(Object sourceObject, ReifiedType targetType) throws Exception { + public Object convert(Object sourceObject, ReifiedType targetType) { return sourceObject; } } diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcImplementationBean.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcImplementationBean.java index b81f833b12..1ab78db9cd 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcImplementationBean.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcImplementationBean.java @@ -33,7 +33,7 @@ public class RpcImplementationBean { private Bundle bundle; private String interfaceName; private RpcService implementation; - private final List> rpcRegistrations = new ArrayList<>();; + private final List> rpcRegistrations = new ArrayList<>(); public void setRpcRegistry(RpcProviderRegistry rpcRegistry) { this.rpcRegistry = rpcRegistry; diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcServiceMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcServiceMetadata.java index b48d04245b..7fc077d287 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcServiceMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcServiceMetadata.java @@ -92,9 +92,6 @@ class RpcServiceMetadata implements ComponentFactoryMetadata { @Override public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("RpcServiceMetadata [id=").append(id).append(", interfaceName=").append(interfaceName) - .append("]"); - return builder.toString(); + return "RpcServiceMetadata [id=" + id + ", interfaceName=" + interfaceName + ", container=" + container + "]"; } } diff --git a/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml b/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml index f9ad6a4da3..527b04303a 100644 --- a/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml +++ b/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml @@ -6,6 +6,7 @@ + diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderModule.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderModule.java index 8c2e8d0546..511f5dfdee 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderModule.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/config/yang/config/actor_system_provider/impl/ActorSystemProviderModule.java @@ -43,19 +43,19 @@ public class ActorSystemProviderModule extends AbstractActorSystemProviderModule WaitingServiceTracker tracker = WaitingServiceTracker.create( ActorSystemProvider.class, bundleContext); ActorSystemProvider delegate = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - return new ForardingActorSystemProvider(delegate, tracker); + return new ForwardingActorSystemProvider(delegate, tracker); } public void setBundleContext(BundleContext bundleContext) { this.bundleContext = bundleContext; } - private static class ForardingActorSystemProvider extends ForwardingObject + private static class ForwardingActorSystemProvider extends ForwardingObject implements ActorSystemProvider, AutoCloseable { private final ActorSystemProvider delegate; private final AutoCloseable closeable; - ForardingActorSystemProvider(ActorSystemProvider delegate, AutoCloseable closeable) { + ForwardingActorSystemProvider(ActorSystemProvider delegate, AutoCloseable closeable) { this.delegate = delegate; this.closeable = closeable; } diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/resources/org/opendaylight/blueprint/toaster-consumer.xml b/opendaylight/md-sal/samples/toaster-consumer/src/main/resources/org/opendaylight/blueprint/toaster-consumer.xml index 6b9bf35463..16e8f98d6a 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/resources/org/opendaylight/blueprint/toaster-consumer.xml +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/resources/org/opendaylight/blueprint/toaster-consumer.xml @@ -3,7 +3,7 @@ xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" odl:use-default-for-reference-types="true"> - + @@ -15,11 +15,11 @@ - - \ No newline at end of file +