From d8be13e36b4a5fca3155e7ab3e840ba9ab5a75b1 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 11 May 2017 17:42:46 +0200 Subject: [PATCH] blueprint: final parameters This automatically-generated patch flags all appropriate parameters as final (including caught exceptions). Change-Id: I565047abcceb31a3da2ef8b2ebdee857e6623196 Signed-off-by: Stephen Kitt --- .../blueprint/BlueprintBundleTracker.java | 48 +++++++++---------- .../BlueprintContainerRestartServiceImpl.java | 28 +++++------ ...ractDependentComponentFactoryMetadata.java | 2 +- .../ext/AbstractInvokableServiceMetadata.java | 4 +- .../blueprint/ext/ActionProviderBean.java | 4 +- .../blueprint/ext/BindingContext.java | 4 +- .../blueprint/ext/ComponentProcessor.java | 16 +++---- .../ext/ConfigXMLReaderException.java | 4 +- .../DataStoreAppConfigDefaultXMLReader.java | 30 ++++++------ .../ext/DataStoreAppConfigMetadata.java | 4 +- .../MandatoryServiceReferenceMetadata.java | 2 +- .../ext/NotificationListenerBean.java | 6 +-- .../blueprint/ext/RoutedRpcMetadata.java | 10 ++-- .../ext/RoutedRpcRegistrationConverter.java | 4 +- .../blueprint/ext/RpcImplementationBean.java | 17 +++---- .../ext/SpecificReferenceListMetadata.java | 22 ++++----- .../ext/StaticReferenceMetadata.java | 2 +- .../ext/StaticServiceReferenceRecipe.java | 12 ++--- 18 files changed, 110 insertions(+), 109 deletions(-) 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 404d78ac83..bc84526d76 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 @@ -71,7 +71,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus * Implemented from BundleActivator. */ @Override - public void start(BundleContext context) { + public void start(final BundleContext context) { LOG.info("Starting {}", getClass().getSimpleName()); restartService = new BlueprintContainerRestartServiceImpl(); @@ -88,7 +88,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus new ServiceTrackerCustomizer() { @Override public BlueprintExtenderService addingService( - ServiceReference reference) { + final ServiceReference reference) { blueprintExtenderService = reference.getBundle().getBundleContext().getService(reference); bundleTracker.open(); @@ -105,13 +105,13 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus } @Override - public void modifiedService(ServiceReference reference, - BlueprintExtenderService service) { + public void modifiedService(final ServiceReference reference, + final BlueprintExtenderService service) { } @Override - public void removedService(ServiceReference reference, - BlueprintExtenderService service) { + public void removedService(final ServiceReference reference, + final BlueprintExtenderService service) { } }); blueprintExtenderServiceTracker.open(); @@ -120,7 +120,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus new ServiceTrackerCustomizer() { @Override public QuiesceParticipant addingService( - ServiceReference reference) { + final ServiceReference reference) { quiesceParticipant = reference.getBundle().getBundleContext().getService(reference); LOG.debug("Got QuiesceParticipant"); @@ -131,26 +131,26 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus } @Override - public void modifiedService(ServiceReference reference, - QuiesceParticipant service) { + public void modifiedService(final ServiceReference reference, + final QuiesceParticipant service) { } @Override - public void removedService(ServiceReference reference, - QuiesceParticipant service) { + public void removedService(final ServiceReference reference, + final QuiesceParticipant service) { } }); quiesceParticipantTracker.open(); } - private void registerNamespaceHandler(BundleContext context) { + private void registerNamespaceHandler(final BundleContext context) { Dictionary props = new Hashtable<>(); props.put("osgi.service.blueprint.namespace", OpendaylightNamespaceHandler.NAMESPACE_1_0_0); namespaceReg = context.registerService(NamespaceHandler.class.getName(), new OpendaylightNamespaceHandler(), props); } - private void registerBlueprintEventHandler(BundleContext context) { + private void registerBlueprintEventHandler(final BundleContext context) { Dictionary props = new Hashtable<>(); props.put(org.osgi.service.event.EventConstants.EVENT_TOPIC, new String[]{EventConstants.TOPIC_CREATED, EventConstants.TOPIC_FAILURE}); @@ -161,7 +161,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus * Implemented from BundleActivator. */ @Override - public void stop(BundleContext context) { + public void stop(final BundleContext context) { bundleTracker.close(); blueprintExtenderServiceTracker.close(); quiesceParticipantTracker.close(); @@ -175,7 +175,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus * Implemented from SynchronousBundleListener. */ @Override - public void bundleChanged(BundleEvent event) { + public void bundleChanged(final BundleEvent event) { // If the system bundle (id 0) is stopping, do an orderly shutdown of all blueprint containers. On // shutdown the system bundle is stopped first. if (event.getBundle().getBundleId() == SYSTEM_BUNDLE_ID && event.getType() == BundleEvent.STOPPING) { @@ -187,7 +187,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus * Implemented from BundleActivator. */ @Override - public Bundle addingBundle(Bundle bundle, BundleEvent event) { + public Bundle addingBundle(final Bundle bundle, final BundleEvent event) { modifiedBundle(bundle, event, bundle); return bundle; } @@ -196,7 +196,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus * Implemented from BundleTrackerCustomizer. */ @Override - public void modifiedBundle(Bundle bundle, BundleEvent event, Bundle object) { + public void modifiedBundle(final Bundle bundle, final BundleEvent event, final Bundle object) { if (shuttingDown) { return; } @@ -216,7 +216,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus * Implemented from BundleTrackerCustomizer. */ @Override - public void removedBundle(Bundle bundle, BundleEvent event, Bundle object) { + public void removedBundle(final Bundle bundle, final BundleEvent event, final Bundle object) { // BlueprintExtenderService will handle this. } @@ -226,7 +226,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus * @param event the event to handle */ @Override - public void handleEvent(Event event) { + public void handleEvent(final Event event) { if (EventConstants.TOPIC_CREATED.equals(event.getTopic())) { LOG.info("Blueprint container for bundle {} was successfully created", event.getProperty(EventConstants.BUNDLE)); @@ -250,7 +250,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus } @SuppressWarnings({ "rawtypes", "unchecked" }) - static List findBlueprintPaths(Bundle bundle) { + static List findBlueprintPaths(final Bundle bundle) { Enumeration rntries = bundle.findEntries(BLUEPRINT_FILE_PATH, BLUEPRINT_FLE_PATTERN, false); if (rntries == null) { return Collections.emptyList(); @@ -288,7 +288,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus LOG.info("Shutdown of blueprint containers complete"); } - private List getBundlesToDestroy(Collection containerBundles) { + private List getBundlesToDestroy(final Collection containerBundles) { List bundlesToDestroy = new ArrayList<>(); // Find all container bundles that either have no registered services or whose services are no @@ -356,12 +356,12 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus return bundlesToDestroy; } - private static int getServiceUsage(ServiceReference ref) { + private static int getServiceUsage(final ServiceReference ref) { Bundle[] usingBundles = ref.getUsingBundles(); return usingBundles != null ? usingBundles.length : 0; } - private T getOSGiService(Class serviceInterface) { + private T getOSGiService(final Class serviceInterface) { try { ServiceReference serviceReference = bundleContext.getServiceReference(serviceInterface); if (serviceReference == null) { @@ -376,7 +376,7 @@ public class BlueprintBundleTracker implements BundleActivator, BundleTrackerCus } return service; - } catch (IllegalStateException e) { + } catch (final IllegalStateException e) { // This is thrown if the BundleContext is no longer valid which is possible on shutdown so we // log as debug. LOG.debug("Error obtaining OSGi service {}", serviceInterface.getSimpleName(), e); 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 7985c5bce0..4448c44287 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 @@ -111,7 +111,7 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo restartExecutor.execute(() -> restartContainerAndDependentsInternal(bundle)); } - private void restartContainerAndDependentsInternal(Bundle forBundle) { + private void restartContainerAndDependentsInternal(final Bundle forBundle) { Preconditions.checkNotNull(blueprintExtenderService); Preconditions.checkNotNull(quiesceParticipant); @@ -151,7 +151,7 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo containerBundles, containerBundles.size() - containerCreationComplete.getCount()); return; } - } catch (InterruptedException e) { + } catch (final InterruptedException e) { LOG.debug("CountDownLatch await was interrupted - returning"); return; } @@ -208,7 +208,7 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo }, Collections.singletonList(nextBundle)); } - private void createContainers(List containerBundles) { + private void createContainers(final List containerBundles) { containerBundles.forEach(bundle -> { List paths = BlueprintBundleTracker.findBlueprintPaths(bundle); @@ -218,7 +218,7 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo }); } - private void restartConfigModules(BundleContext bundleContext, List> configModules) { if (configModules.isEmpty()) { return; @@ -249,8 +249,8 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo } - private void restartConfigModules(List> configModules, - ConfigSubsystemFacade configFacade) throws ParserConfigurationException, DocumentedException, + private void restartConfigModules(final List> configModules, + final ConfigSubsystemFacade configFacade) throws ParserConfigurationException, DocumentedException, ValidationException, ConflictingVersionException { Document document = XmlUtil.newDocument(); @@ -274,7 +274,7 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo Element moduleElement = configMapping.moduleToXml(moduleNamespace, moduleId.getFactoryName(), moduleId.getInstanceName(), instanceON, document); modulesElement.appendChild(moduleElement); - } catch (InstanceNotFoundException e) { + } catch (final InstanceNotFoundException e) { LOG.warn("Error looking up config module: namespace {}, module name {}, instance {}", moduleNamespace, moduleId.getFactoryName(), moduleId.getInstanceName(), e); } @@ -300,8 +300,8 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo * @param containerBundles the current set of bundles containing blueprint containers * @param configModules the current set of bundles containing config modules */ - private void findDependentContainersRecursively(Bundle bundle, Set containerBundles, - List> configModules) { + private void findDependentContainersRecursively(final Bundle bundle, final Set containerBundles, + final List> configModules) { if (!containerBundles.add(bundle)) { // Already seen this bundle... return; @@ -324,8 +324,8 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo } } - private void possiblyAddConfigModuleIdentifier(ServiceReference reference, - List> configModules) { + private void possiblyAddConfigModuleIdentifier(final ServiceReference reference, + final List> configModules) { Object moduleNamespace = reference.getProperty(CONFIG_MODULE_NAMESPACE_PROP); if (moduleNamespace == null) { return; @@ -347,8 +347,8 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo } @Nullable - private String getRequiredConfigModuleProperty(String propName, Object moduleNamespace, - ServiceReference reference) { + private String getRequiredConfigModuleProperty(final String propName, final Object moduleNamespace, + final ServiceReference reference) { Object value = reference.getProperty(propName); if (value == null) { LOG.warn( @@ -360,7 +360,7 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo return value.toString(); } - private ServiceRegistration registerEventHandler(BundleContext bundleContext, EventHandler handler) { + private ServiceRegistration registerEventHandler(final BundleContext bundleContext, final EventHandler handler) { Dictionary props = new Hashtable<>(); props.put(org.osgi.service.event.EventConstants.EVENT_TOPIC, new String[]{EventConstants.TOPIC_CREATED, EventConstants.TOPIC_FAILURE}); diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractDependentComponentFactoryMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractDependentComponentFactoryMetadata.java index 9bd51a460a..81b374d9fa 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractDependentComponentFactoryMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractDependentComponentFactoryMetadata.java @@ -239,7 +239,7 @@ abstract class AbstractDependentComponentFactoryMetadata implements DependentCom } return service; - } catch (IllegalStateException e) { + } catch (final IllegalStateException e) { // This is thrown if the BundleContext is no longer valid which is possible on shutdown so we // log as debug. log.debug("{}: Error obtaining {}", logName(), serviceInterface.getSimpleName(), e); diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractInvokableServiceMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractInvokableServiceMetadata.java index 1c1f4cb813..7f8afe64eb 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractInvokableServiceMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractInvokableServiceMetadata.java @@ -51,7 +51,7 @@ abstract class AbstractInvokableServiceMetadata extends AbstractDependentCompone final Class interfaceClass; try { interfaceClass = container().getBundleContext().getBundle().loadClass(interfaceName); - } catch (Exception e) { + } catch (final Exception e) { throw new ComponentDefinitionException(String.format("%s: Error obtaining interface class %s", logName(), interfaceName), e); } @@ -136,7 +136,7 @@ abstract class AbstractInvokableServiceMetadata extends AbstractDependentCompone log.debug("{}: create returning service {}", logName(), rpcService); return rpcService; - } catch (RuntimeException e) { + } catch (final RuntimeException e) { throw new ComponentDefinitionException("Error getting RPC service for " + interfaceName, e); } } diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java index 104571504e..8c5b2b29b0 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java @@ -93,7 +93,7 @@ public class ActionProviderBean { if (reg != null) { try { reg.close(); - } catch (Exception e) { + } catch (final Exception e) { LOG.warn("{}: error while unregistering", ACTION_PROVIDER, e); } finally { reg = null; @@ -107,7 +107,7 @@ public class ActionProviderBean { try { iface = bundle.loadClass(interfaceName); - } catch (ClassNotFoundException e) { + } catch (final ClassNotFoundException e) { throw new ComponentDefinitionException(String.format( "The specified \"interface\" for %s \"%s\" does not refer to an available class", interfaceName, ACTION_PROVIDER), e); diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java index 91899301aa..e4ae3fc0ef 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java @@ -34,8 +34,8 @@ import org.w3c.dom.Element; */ public abstract class BindingContext { - public static BindingContext create(String logName, Class klass, - String appConfigListKeyValue) { + public static BindingContext create(final String logName, final Class klass, + final String appConfigListKeyValue) { if (Identifiable.class.isAssignableFrom(klass)) { // The binding class corresponds to a yang list. if (Strings.isNullOrEmpty(appConfigListKeyValue)) { 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 14b3c2b849..97f2fd2b0c 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 @@ -47,19 +47,19 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor private boolean restartDependentsOnUpdates; private boolean useDefaultForReferenceTypes; - public void setBundle(Bundle bundle) { + public void setBundle(final Bundle bundle) { this.bundle = bundle; } - public void setBlueprintContainerRestartService(BlueprintContainerRestartService restartService) { + public void setBlueprintContainerRestartService(final BlueprintContainerRestartService restartService) { this.blueprintContainerRestartService = restartService; } - public void setRestartDependentsOnUpdates(boolean restartDependentsOnUpdates) { + public void setRestartDependentsOnUpdates(final boolean restartDependentsOnUpdates) { this.restartDependentsOnUpdates = restartDependentsOnUpdates; } - public void setUseDefaultForReferenceTypes(boolean useDefaultForReferenceTypes) { + public void setUseDefaultForReferenceTypes(final boolean useDefaultForReferenceTypes) { this.useDefaultForReferenceTypes = useDefaultForReferenceTypes; } @@ -70,7 +70,7 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor } @Override - public void process(ComponentDefinitionRegistry registry) { + public void process(final ComponentDefinitionRegistry registry) { LOG.debug("{}: In process", logName()); for (String name : registry.getComponentDefinitionNames()) { @@ -83,7 +83,7 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor } } - private void processServiceReferenceMetadata(MutableServiceReferenceMetadata serviceRef) { + private void processServiceReferenceMetadata(final MutableServiceReferenceMetadata serviceRef) { if (!useDefaultForReferenceTypes) { return; } @@ -103,7 +103,7 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor } } - private void processMutableBeanMetadata(MutableBeanMetadata bean) { + private void processMutableBeanMetadata(final MutableBeanMetadata bean) { if (restartDependentsOnUpdates && bean.getRuntimeClass() != null && AbstractPropertyPlaceholder.class.isAssignableFrom(bean.getRuntimeClass())) { LOG.debug("{}: Found PropertyPlaceholder bean: {}, runtime {}", logName(), bean.getId(), @@ -136,7 +136,7 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor private volatile boolean initialUpdate = true; @Override - public void updated(Dictionary properties) { + public void updated(final Dictionary properties) { LOG.debug("{}: ManagedService updated for persistentId {}, properties: {}, initialUpdate: {}", logName(), persistentId, properties, initialUpdate); diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ConfigXMLReaderException.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ConfigXMLReaderException.java index 91da124386..12a547e08f 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ConfigXMLReaderException.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ConfigXMLReaderException.java @@ -15,11 +15,11 @@ package org.opendaylight.controller.blueprint.ext; public class ConfigXMLReaderException extends Exception { private static final long serialVersionUID = 1L; - public ConfigXMLReaderException(String message) { + public ConfigXMLReaderException(final String message) { super(message); } - public ConfigXMLReaderException(String message, Throwable cause) { + public ConfigXMLReaderException(final String message, final Throwable cause) { super(message, cause); } diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java index 57f3abce85..2d24c21463 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigDefaultXMLReader.java @@ -60,12 +60,12 @@ public class DataStoreAppConfigDefaultXMLReader { } public DataStoreAppConfigDefaultXMLReader( - String logName, - String defaultAppConfigFileName, - SchemaService schemaService, - BindingNormalizedNodeSerializer bindingSerializer, - BindingContext bindingContext, - ConfigURLProvider inputStreamProvider) { + final String logName, + final String defaultAppConfigFileName, + final SchemaService schemaService, + final BindingNormalizedNodeSerializer bindingSerializer, + final BindingContext bindingContext, + final ConfigURLProvider inputStreamProvider) { this.logName = logName; this.defaultAppConfigFileName = defaultAppConfigFileName; @@ -76,17 +76,17 @@ public class DataStoreAppConfigDefaultXMLReader { } public DataStoreAppConfigDefaultXMLReader( - Class testClass, - String defaultAppConfigFileName, - SchemaService schemaService, - BindingNormalizedNodeSerializer bindingSerializer, - Class klass) { + final Class testClass, + final String defaultAppConfigFileName, + final SchemaService schemaService, + final BindingNormalizedNodeSerializer bindingSerializer, + final Class klass) { this(testClass.getName(), defaultAppConfigFileName, schemaService, bindingSerializer, BindingContext.create(testClass.getName(), klass, null), appConfigFileName -> Optional.of(getURL(testClass, defaultAppConfigFileName))); } - private static URL getURL(Class testClass, String defaultAppConfigFileName) { + private static URL getURL(final Class testClass, final String defaultAppConfigFileName) { return Resources.getResource(testClass, defaultAppConfigFileName); } @@ -98,7 +98,7 @@ public class DataStoreAppConfigDefaultXMLReader { } @SuppressWarnings("unchecked") - public T createDefaultInstance(FallbackConfigProvider fallback) throws ConfigXMLReaderException { + public T createDefaultInstance(final FallbackConfigProvider fallback) throws ConfigXMLReaderException { YangInstanceIdentifier yangPath = bindingSerializer.toYangInstanceIdentifier(bindingContext.appConfigPath); LOG.debug("{}: Creating app config instance from path {}, Qname: {}", logName, yangPath, @@ -157,13 +157,13 @@ public class DataStoreAppConfigDefaultXMLReader { appConfigFileName = moduleName + "_" + bindingContext.bindingQName.getLocalName() + ".xml"; } - DomToNormalizedNodeParserFactory parserFactory = DomToNormalizedNodeParserFactory.getInstance( + final DomToNormalizedNodeParserFactory parserFactory = DomToNormalizedNodeParserFactory.getInstance( XmlUtils.DEFAULT_XML_CODEC_PROVIDER, schemaContext); Optional optionalURL; try { optionalURL = inputStreamProvider.getURL(appConfigFileName); - } catch (IOException e) { + } catch (final IOException e) { String msg = String.format("%s: Could not getURL()", logName); LOG.error(msg, e); throw new ConfigXMLReaderException(msg, e); diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java index bc4ebe2a64..f1024d7e4b 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/DataStoreAppConfigMetadata.java @@ -103,7 +103,7 @@ public class DataStoreAppConfigMetadata extends AbstractDependentComponentFactor } appConfigBindingClass = (Class) bindingClass; - } catch (ClassNotFoundException e) { + } catch (final ClassNotFoundException e) { throw new ComponentDefinitionException(String.format("%s: Error loading app config binding class %s", logName(), appConfigBindingClassName), e); } @@ -269,7 +269,7 @@ public class DataStoreAppConfigMetadata extends AbstractDependentComponentFactor } }); - } catch (ConfigXMLReaderException e) { + } catch (final ConfigXMLReaderException e) { if (e.getCause() == null) { setFailureMessage(e.getMessage()); } else { diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/MandatoryServiceReferenceMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/MandatoryServiceReferenceMetadata.java index 52cfc9feb6..8139e1de52 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/MandatoryServiceReferenceMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/MandatoryServiceReferenceMetadata.java @@ -23,7 +23,7 @@ class MandatoryServiceReferenceMetadata implements ServiceReferenceMetadata { private final String interfaceClass; private final String id; - MandatoryServiceReferenceMetadata(String id, String interfaceClass) { + MandatoryServiceReferenceMetadata(final String id, final String interfaceClass) { this.id = Preconditions.checkNotNull(id); this.interfaceClass = interfaceClass; } 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 ccf6216d3d..3a2a0b837b 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 @@ -29,15 +29,15 @@ public class NotificationListenerBean { private NotificationListener notificationListener; private ListenerRegistration registration; - public void setNotificationService(NotificationService notificationService) { + public void setNotificationService(final NotificationService notificationService) { this.notificationService = notificationService; } - public void setNotificationListener(NotificationListener notificationListener) { + public void setNotificationListener(final NotificationListener notificationListener) { this.notificationListener = notificationListener; } - public void setBundle(Bundle bundle) { + public void setBundle(final Bundle bundle) { this.bundle = bundle; } 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 04e6d30620..725e568785 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 @@ -34,7 +34,7 @@ class RoutedRpcMetadata implements ComponentFactoryMetadata { private final String implementationRefId; private ExtendedBlueprintContainer container; - RoutedRpcMetadata(String id, String interfaceName, String implementationRefId) { + RoutedRpcMetadata(final String id, final String interfaceName, final String implementationRefId) { this.id = id; this.interfaceName = interfaceName; this.implementationRefId = implementationRefId; @@ -56,7 +56,7 @@ class RoutedRpcMetadata implements ComponentFactoryMetadata { } @Override - public void init(ExtendedBlueprintContainer newContainer) { + public void init(final ExtendedBlueprintContainer newContainer) { this.container = newContainer; LOG.debug("{}: In init", logName()); @@ -94,16 +94,16 @@ class RoutedRpcMetadata implements ComponentFactoryMetadata { implementation, rpcInterface); return rpcRegistry.addRoutedRpcImplementation(rpcInterface, (RpcService)implementation); - } catch (ComponentDefinitionException e) { + } catch (final ComponentDefinitionException e) { throw e; - } catch (Exception e) { + } catch (final Exception e) { throw new ComponentDefinitionException(String.format( "Error processing \"%s\" for %s", ROUTED_RPC_IMPLEMENTATION, implementation.getClass()), e); } } @Override - public void destroy(Object instance) { + public void destroy(final Object instance) { LOG.debug("{}: In destroy: instance: {}", logName(), instance); ((RoutedRpcRegistration)instance).close(); 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 5ae9a1cf72..66174438b2 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 @@ -22,13 +22,13 @@ import org.osgi.service.blueprint.container.ReifiedType; */ public class RoutedRpcRegistrationConverter implements Converter { @Override - public boolean canConvert(Object sourceObject, ReifiedType targetType) { + public boolean canConvert(final Object sourceObject, final ReifiedType targetType) { return sourceObject instanceof RoutedRpcRegistration && RoutedRpcRegistration.class.isAssignableFrom(targetType.getRawClass()); } @Override - public Object convert(Object sourceObject, ReifiedType targetType) { + public Object convert(final Object sourceObject, final 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 3144328c99..338d0a2a2c 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 @@ -35,19 +35,19 @@ public class RpcImplementationBean { private RpcService implementation; private final List> rpcRegistrations = new ArrayList<>(); - public void setRpcRegistry(RpcProviderRegistry rpcRegistry) { + public void setRpcRegistry(final RpcProviderRegistry rpcRegistry) { this.rpcRegistry = rpcRegistry; } - public void setBundle(Bundle bundle) { + public void setBundle(final Bundle bundle) { this.bundle = bundle; } - public void setInterfaceName(String interfaceName) { + public void setInterfaceName(final String interfaceName) { this.interfaceName = interfaceName; } - public void setImplementation(RpcService implementation) { + public void setImplementation(final RpcService implementation) { this.implementation = implementation; } @@ -63,9 +63,9 @@ public class RpcImplementationBean { for (Class rpcInterface : rpcInterfaces) { rpcRegistrations.add(rpcRegistry.addRpcImplementation(rpcInterface, implementation)); } - } catch (ComponentDefinitionException e) { + } catch (final ComponentDefinitionException e) { throw e; - } catch (Exception e) { + } catch (final Exception e) { throw new ComponentDefinitionException(String.format( "Error processing \"%s\" for %s", RPC_IMPLEMENTATION, implementation.getClass()), e); } @@ -78,8 +78,9 @@ public class RpcImplementationBean { } @SuppressWarnings("unchecked") - static List> getImplementedRpcServiceInterfaces(String interfaceName, - Class implementationClass, Bundle bundle, String logName) throws ClassNotFoundException { + static List> getImplementedRpcServiceInterfaces(final String interfaceName, + final Class implementationClass, final Bundle bundle, final String logName) + throws ClassNotFoundException { if (!Strings.isNullOrEmpty(interfaceName)) { Class rpcInterface = bundle.loadClass(interfaceName); diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java index 9a0bd29a09..e781ddd16a 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/SpecificReferenceListMetadata.java @@ -52,7 +52,7 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet private volatile BundleTracker bundleTracker; private volatile ServiceTracker serviceTracker; - SpecificReferenceListMetadata(String id, String interfaceName) { + SpecificReferenceListMetadata(final String id, final String interfaceName) { super(id); this.interfaceName = interfaceName; serviceResourcePath = "META-INF/services/" + interfaceName; @@ -62,17 +62,17 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet protected void startTracking() { BundleTrackerCustomizer bundleListener = new BundleTrackerCustomizer() { @Override - public Bundle addingBundle(Bundle bundle, BundleEvent event) { + public Bundle addingBundle(final Bundle bundle, final BundleEvent event) { bundleAdded(bundle); return bundle; } @Override - public void modifiedBundle(Bundle bundle, BundleEvent event, Bundle object) { + public void modifiedBundle(final Bundle bundle, final BundleEvent event, final Bundle object) { } @Override - public void removedBundle(Bundle bundle, BundleEvent event, Bundle object) { + public void removedBundle(final Bundle bundle, final BundleEvent event, final Bundle object) { } }; @@ -89,16 +89,16 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet ServiceTrackerCustomizer serviceListener = new ServiceTrackerCustomizer() { @Override - public Object addingService(ServiceReference reference) { + public Object addingService(final ServiceReference reference) { return serviceAdded(reference); } @Override - public void modifiedService(ServiceReference reference, Object service) { + public void modifiedService(final ServiceReference reference, final Object service) { } @Override - public void removedService(ServiceReference reference, Object service) { + public void removedService(final ServiceReference reference, final Object service) { container().getBundleContext().ungetService(reference); } }; @@ -109,7 +109,7 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet serviceTracker.open(); } - private void bundleAdded(Bundle bundle) { + private void bundleAdded(final Bundle bundle) { URL resource = bundle.getEntry(serviceResourcePath); if (resource == null) { return; @@ -133,13 +133,13 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet LOG.debug("{}: Retrieved service type {}", logName(), serviceType); expectedServiceTypes.add(serviceType); } - } catch (IOException e) { + } catch (final IOException e) { setFailure(String.format("%s: Error reading resource %s from bundle %s", logName(), resource, bundle.getSymbolicName()), e); } } - private Object serviceAdded(ServiceReference reference) { + private Object serviceAdded(final ServiceReference reference) { Object service = container().getBundleContext().getService(reference); String serviceType = (String) reference.getProperty(OpendaylightNamespaceHandler.TYPE_ATTR); @@ -196,7 +196,7 @@ class SpecificReferenceListMetadata extends AbstractDependentComponentFactoryMet } @Override - public void destroy(Object instance) { + public void destroy(final Object instance) { super.destroy(instance); if (bundleTracker != null) { diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticReferenceMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticReferenceMetadata.java index 693f518e15..97c04af56f 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticReferenceMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticReferenceMetadata.java @@ -24,7 +24,7 @@ class StaticReferenceMetadata extends AbstractDependentComponentFactoryMetadata private final String interfaceName; private volatile Object retrievedService; - StaticReferenceMetadata(String id, String interfaceName) { + StaticReferenceMetadata(final String id, final String interfaceName) { super(id); this.interfaceName = interfaceName; } diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticServiceReferenceRecipe.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticServiceReferenceRecipe.java index 3689805655..8f3ca2446a 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticServiceReferenceRecipe.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticServiceReferenceRecipe.java @@ -35,26 +35,26 @@ class StaticServiceReferenceRecipe extends AbstractServiceReferenceRecipe { private volatile Object trackedService; private Consumer serviceSatisfiedCallback; - StaticServiceReferenceRecipe(String name, ExtendedBlueprintContainer blueprintContainer, - String interfaceClass) { + StaticServiceReferenceRecipe(final String name, final ExtendedBlueprintContainer blueprintContainer, + final String interfaceClass) { super(name, blueprintContainer, new MandatoryServiceReferenceMetadata(name, interfaceClass), null, null, Collections.emptyList()); } - void startTracking(Consumer newServiceSatisfiedCallback) { + void startTracking(final Consumer newServiceSatisfiedCallback) { this.serviceSatisfiedCallback = newServiceSatisfiedCallback; super.start(NOOP_LISTENER); } @SuppressWarnings("rawtypes") @Override - protected void track(ServiceReference reference) { + protected void track(final ServiceReference reference) { retrack(); } @SuppressWarnings("rawtypes") @Override - protected void untrack(ServiceReference reference) { + protected void untrack(final ServiceReference reference) { LOG.debug("{}: In untrack {}", getName(), reference); if (trackedServiceReference == reference) { @@ -84,7 +84,7 @@ class StaticServiceReferenceRecipe extends AbstractServiceReferenceRecipe { if (trackedServiceReference != null && trackedService != null) { try { getBundleContextForServiceLookup().ungetService(trackedServiceReference); - } catch (IllegalStateException e) { + } catch (final IllegalStateException e) { // In case the service no longer exists, ignore. } -- 2.36.6