From 46306a374d717b1579987bd678f880e6f61f72e7 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Fri, 12 May 2017 14:08:44 +0200 Subject: [PATCH] config-persister-feature-adapter: final parameters This automatically-generated patch flags all appropriate parameters as final (including caught exceptions). Change-Id: Ic198d806782423545323cc00075219fa89d06dd4 Signed-off-by: Stephen Kitt --- .../ConfigPusherFeatureActivator.java | 4 ++-- .../internal/AbstractFeatureWrapper.java | 4 ++-- .../internal/ChildAwareFeatureWrapper.java | 6 +++--- .../internal/ConfigFeaturesListener.java | 6 +++--- .../internal/ConfigPusherCustomizer.java | 6 +++--- .../internal/ConfigPushingRunnable.java | 10 +++++----- .../internal/FeatureConfigPusher.java | 4 ++-- .../internal/FeatureConfigSnapshotHolder.java | 2 +- .../internal/FeatureServiceCustomizer.java | 12 ++++++------ 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/ConfigPusherFeatureActivator.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/ConfigPusherFeatureActivator.java index 0b4f6f7781..c20c6f9182 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/ConfigPusherFeatureActivator.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/ConfigPusherFeatureActivator.java @@ -19,14 +19,14 @@ public class ConfigPusherFeatureActivator implements BundleActivator { ConfigPusherCustomizer cpc = null; ServiceTracker cpst = null; - public void start(BundleContext context) throws Exception { + public void start(final BundleContext context) throws Exception { bc = context; cpc = new ConfigPusherCustomizer(); cpst = new ServiceTracker<>(bc, ConfigPusher.class.getName(), cpc); cpst.open(); } - public void stop(BundleContext context) throws Exception { + public void stop(final BundleContext context) throws Exception { if(cpst != null) { cpst.close(); cpst = null; diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java index eec7882529..7e33ceea2a 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java @@ -88,7 +88,7 @@ public class AbstractFeatureWrapper implements Feature { return Optional.absent(); } - private static boolean isConfigSnapshot(String fileName) { + private static boolean isConfigSnapshot(final String fileName) { if(!Files.getFileExtension(fileName).equals(CONFIG_FILE_SUFFIX)) { return false; } @@ -110,7 +110,7 @@ public class AbstractFeatureWrapper implements Feature { Element root = builderFactory.newDocumentBuilder().parse(fis).getDocumentElement(); return ConfigSnapshot.SNAPSHOT_ROOT_ELEMENT_NAME.equals(root.getLocalName()); - } catch (Exception e) { + } catch (final Exception e) { LOG.error("Could not parse XML file {}", file, e); return false; } diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ChildAwareFeatureWrapper.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ChildAwareFeatureWrapper.java index a9d06853a2..f51bf4738a 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ChildAwareFeatureWrapper.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ChildAwareFeatureWrapper.java @@ -31,7 +31,7 @@ public class ChildAwareFeatureWrapper extends AbstractFeatureWrapper implements private static final Logger LOG = LoggerFactory.getLogger(ChildAwareFeatureWrapper.class); private FeaturesService featuresService= null; - protected ChildAwareFeatureWrapper(Feature f) { + protected ChildAwareFeatureWrapper(final Feature f) { // Don't use without a feature service } @@ -39,7 +39,7 @@ public class ChildAwareFeatureWrapper extends AbstractFeatureWrapper implements * @param f Feature to wrap * @param s FeaturesService to look up dependencies */ - ChildAwareFeatureWrapper(Feature f, FeaturesService s) throws Exception { + ChildAwareFeatureWrapper(final Feature f, final FeaturesService s) throws Exception { super(s.getFeature(f.getName(), f.getVersion())); Preconditions.checkNotNull(s, "FeatureWrapper requires non-null FeatureService in constructor"); this.featuresService = s; @@ -87,7 +87,7 @@ public class ChildAwareFeatureWrapper extends AbstractFeatureWrapper implements return snapShotHolders; } - protected Feature extractFeatureFromDependency(Dependency dependency) throws Exception { + protected Feature extractFeatureFromDependency(final Dependency dependency) throws Exception { Feature[] features = featuresService.listFeatures(); VersionRange range = org.apache.karaf.features.internal.model.Feature.DEFAULT_VERSION.equals(dependency.getVersion()) ? VersionRange.ANY_VERSION : new VersionRange(dependency.getVersion(), true, true); diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigFeaturesListener.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigFeaturesListener.java index 3297ba4939..075db509f8 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigFeaturesListener.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigFeaturesListener.java @@ -23,18 +23,18 @@ public class ConfigFeaturesListener implements FeaturesListener, AutoCloseable private BlockingQueue queue = new LinkedBlockingQueue<>(QUEUE_SIZE); Thread pushingThread = null; - public ConfigFeaturesListener(ConfigPusher p, FeaturesService f) { + public ConfigFeaturesListener(final ConfigPusher p, final FeaturesService f) { pushingThread = new Thread(new ConfigPushingRunnable(p, f, queue), "ConfigFeatureListener - ConfigPusher"); pushingThread.start(); } @Override - public void featureEvent(FeatureEvent event) { + public void featureEvent(final FeatureEvent event) { queue.offer(event); } @Override - public void repositoryEvent(RepositoryEvent event) { + public void repositoryEvent(final RepositoryEvent event) { LOG.debug("Repository: {} {}", event.getType(), event.getRepository()); } diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPusherCustomizer.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPusherCustomizer.java index 420e8d7a35..ac10c68c8f 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPusherCustomizer.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPusherCustomizer.java @@ -23,7 +23,7 @@ public class ConfigPusherCustomizer implements ServiceTrackerCustomizer fsst = null; @Override - public ConfigPusher addingService(ServiceReference configPusherServiceReference) { + public ConfigPusher addingService(final ServiceReference configPusherServiceReference) { LOG.trace("Got ConfigPusherCustomizer.addingService {}", configPusherServiceReference); BundleContext bc = configPusherServiceReference.getBundle().getBundleContext(); ConfigPusher cpService = bc.getService(configPusherServiceReference); @@ -34,12 +34,12 @@ public class ConfigPusherCustomizer implements ServiceTrackerCustomizer configPusherServiceReference, ConfigPusher configPusher) { + public void modifiedService(final ServiceReference configPusherServiceReference, final ConfigPusher configPusher) { // we don't care if the properties change } @Override - public void removedService(ServiceReference configPusherServiceReference, ConfigPusher configPusher) { + public void removedService(final ServiceReference configPusherServiceReference, final ConfigPusher configPusher) { this.close(); } diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPushingRunnable.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPushingRunnable.java index cfdad56094..48c494b5c7 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPushingRunnable.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/ConfigPushingRunnable.java @@ -25,7 +25,7 @@ public class ConfigPushingRunnable implements Runnable { private static final int POLL_TIME = 1; private BlockingQueue queue; private FeatureConfigPusher configPusher; - public ConfigPushingRunnable(ConfigPusher p, FeaturesService f,BlockingQueue q) { + public ConfigPushingRunnable(final ConfigPusher p, final FeaturesService f, final BlockingQueue q) { queue = q; configPusher = new FeatureConfigPusher(p, f); } @@ -50,16 +50,16 @@ public class ConfigPushingRunnable implements Runnable { LOG.error("ConfigPushingRunnable - exiting"); return; } - } catch (InterruptedException e) { + } catch (final InterruptedException e) { LOG.error("ConfigPushingRunnable - interupted"); interuppted = true; - } catch (Exception e) { + } catch (final Exception e) { LOG.error("Exception while processing features {} event {}", toInstall, event, e); } } } - protected void processFeatureEvent(FeatureEvent event, List toInstall) throws Exception { + protected void processFeatureEvent(final FeatureEvent event, final List toInstall) throws Exception { if(event.getType() == EventType.FeatureInstalled) { toInstall.add(event.getFeature()); LinkedHashMultimap result = configPusher.pushConfigs(toInstall); @@ -69,7 +69,7 @@ public class ConfigPushingRunnable implements Runnable { } } - protected void logPushResult(LinkedHashMultimap results) { + protected void logPushResult(final LinkedHashMultimap results) { for(Feature f:results.keySet()) { LOG.info("Pushed configs for feature {} {}",f,results.get(f)); } diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java index 406739d1c7..15223a8f9f 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java @@ -111,7 +111,7 @@ public class FeatureConfigPusher { // we're fully on Karaf 4 only, as a comment in BUG-6787 indicates that (in Karaf 4) : // "the 'installed' Map of FeaturesServiceImpl .. appears to be correctly synchronized/thread-safe". // (Or, if it's still NOK, then it could be fixed properly upstream in Karaf once we're on recent.) - } catch (ConcurrentModificationException e) { + } catch (final ConcurrentModificationException e) { // BUG-6787 experience shows that a LOG.warn (or info) here is very confusing to end-users; // as we have a retry loop anyway, there is no point informing (and confusing) users of this // intermediate state of, so ... NOOP, do not log here. @@ -119,7 +119,7 @@ public class FeatureConfigPusher { } try { Thread.sleep(RETRY_PAUSE_MILLIS); - } catch (InterruptedException e1) { + } catch (final InterruptedException e1) { throw new IllegalStateException(e1); } } diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigSnapshotHolder.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigSnapshotHolder.java index 70f7366895..7107cc994d 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigSnapshotHolder.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigSnapshotHolder.java @@ -93,7 +93,7 @@ public class FeatureConfigSnapshotHolder implements ConfigSnapshotHolder { * We really care most about the underlying ConfigShapshot, so compute equality on that */ @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureServiceCustomizer.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureServiceCustomizer.java index 5ce58ef053..9a1764e574 100644 --- a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureServiceCustomizer.java +++ b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureServiceCustomizer.java @@ -25,12 +25,12 @@ public class FeatureServiceCustomizer implements ServiceTrackerCustomizer registration; - FeatureServiceCustomizer(ConfigPusher c) { + FeatureServiceCustomizer(final ConfigPusher c) { configPusher = c; } @Override - public FeaturesService addingService(ServiceReference reference) { + public FeaturesService addingService(final ServiceReference reference) { BundleContext bc = reference.getBundle().getBundleContext(); final FeaturesService featureService = bc.getService(reference); final Optional currentPersister = XmlFileStorageAdapter.getInstance(); @@ -54,14 +54,14 @@ public class FeatureServiceCustomizer implements ServiceTrackerCustomizer reference, - FeaturesService service) { + public void modifiedService(final ServiceReference reference, + final FeaturesService service) { // we don't care if the properties change } @Override - public void removedService(ServiceReference reference, - FeaturesService service) { + public void removedService(final ServiceReference reference, + final FeaturesService service) { close(); } -- 2.36.6