Change-Id: I39a2c07176406d469f18949b30abb3deb3c21f6c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
// restart config modules.
final CountDownLatch containerCreationComplete = new CountDownLatch(containerBundles.size());
ServiceRegistration<?> eventHandlerReg = registerEventHandler(forBundle.getBundleContext(), event -> {
// restart config modules.
final CountDownLatch containerCreationComplete = new CountDownLatch(containerBundles.size());
ServiceRegistration<?> eventHandlerReg = registerEventHandler(forBundle.getBundleContext(), event -> {
- LOG.debug("handleEvent {} for bundle {}", event.getTopic(), event.getProperty(EventConstants.BUNDLE));
- if (containerBundles.contains(event.getProperty(EventConstants.BUNDLE))) {
+ final Bundle bundle = (Bundle) event.getProperty(EventConstants.BUNDLE);
+ LOG.debug("handleEvent {} for bundle {}", event.getTopic(), bundle);
+ if (containerBundles.contains(bundle)) {
containerCreationComplete.countDown();
}
});
containerCreationComplete.countDown();
}
});
public void init() {
// First resolve the interface class
public void init() {
// First resolve the interface class
- final Class<RpcService> interfaceClass = getRpcClass(interfaceName);
+ final Class<RpcService> interfaceClass = getRpcClass();
LOG.debug("{}: resolved interface {} to {}", ACTION_PROVIDER, interfaceName, interfaceClass);
LOG.debug("{}: resolved interface {} to {}", ACTION_PROVIDER, interfaceName, interfaceClass);
}
@SuppressWarnings("unchecked")
}
@SuppressWarnings("unchecked")
- private Class<RpcService> getRpcClass(final String interfaceName) {
+ private Class<RpcService> getRpcClass() {
final Class<?> iface;
try {
final Class<?> iface;
try {
}
private void readInitialAppConfig(final DataBroker dataBroker) {
}
private void readInitialAppConfig(final DataBroker dataBroker) {
+ @SuppressWarnings("resource") // it's closed in the callback
final ReadOnlyTransaction readOnlyTx = dataBroker.newReadOnlyTransaction();
CheckedFuture<Optional<DataObject>, ReadFailedException> future = readOnlyTx.read(
LogicalDatastoreType.CONFIGURATION, bindingContext.appConfigPath);
final ReadOnlyTransaction readOnlyTx = dataBroker.newReadOnlyTransaction();
CheckedFuture<Optional<DataObject>, ReadFailedException> future = readOnlyTx.read(
LogicalDatastoreType.CONFIGURATION, bindingContext.appConfigPath);
private Object serviceAdded(ServiceReference<Object> reference) {
Object service = container().getBundleContext().getService(reference);
private Object serviceAdded(ServiceReference<Object> reference) {
Object service = container().getBundleContext().getService(reference);
- Object serviceType = reference.getProperty(OpendaylightNamespaceHandler.TYPE_ATTR);
+ String serviceType = (String) reference.getProperty(OpendaylightNamespaceHandler.TYPE_ATTR);
LOG.debug("{}: Service type {} added from bundle {}", logName(), serviceType,
reference.getBundle().getSymbolicName());
LOG.debug("{}: Service type {} added from bundle {}", logName(), serviceType,
reference.getBundle().getSymbolicName());
if (isSatisfied()) {
restartContainer();
} else {
if (isSatisfied()) {
restartContainer();
} else {
- retrievedServiceTypes.add(serviceType.toString());
+ retrievedServiceTypes.add(serviceType);
retrievedServices.add(service);
if (retrievedServiceTypes.equals(expectedServiceTypes)) {
retrievedServices.add(service);
if (retrievedServiceTypes.equals(expectedServiceTypes)) {