From f6f6f2d6cddf34e44ecef07b8fb1966d8e3af46b Mon Sep 17 00:00:00 2001 From: Marian Dubai Date: Thu, 20 Nov 2014 11:01:58 +0100 Subject: [PATCH] Fix checkstyle warnings in config-persister-feature-adapter Change-Id: If961a029b48d85b58ca10b9b71f5fc29d41dbe9c Signed-off-by: Marian Dubai --- .../internal/AbstractFeatureWrapper.java | 9 +++------ .../internal/ChildAwareFeatureWrapper.java | 13 +++++-------- .../internal/ConfigFeaturesListener.java | 5 ++--- .../internal/ConfigPushingRunnable.java | 14 ++++++-------- .../internal/FeatureConfigSnapshotHolder.java | 11 ++++------- 5 files changed, 20 insertions(+), 32 deletions(-) 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 3e004b4d7c..90b6d53bd1 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 @@ -7,12 +7,11 @@ */ package org.opendaylight.controller.configpusherfeature.internal; +import com.google.common.base.Preconditions; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; - import javax.xml.bind.JAXBException; - import org.apache.karaf.features.BundleInfo; import org.apache.karaf.features.Conditional; import org.apache.karaf.features.ConfigFileInfo; @@ -21,8 +20,6 @@ import org.apache.karaf.features.Feature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; - /* * Wrap a Feature for the purposes of extracting the FeatureConfigSnapshotHolders from * its underlying ConfigFileInfo's @@ -30,7 +27,7 @@ import com.google.common.base.Preconditions; * Delegates the the contained feature and provides additional methods. */ public class AbstractFeatureWrapper implements Feature { - private static final Logger LOGGER = LoggerFactory.getLogger(AbstractFeatureWrapper.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractFeatureWrapper.class); protected Feature feature = null; protected AbstractFeatureWrapper() { @@ -55,7 +52,7 @@ public class AbstractFeatureWrapper implements Feature { try { snapShotHolders.add(new FeatureConfigSnapshotHolder(c,this)); } catch (JAXBException e) { - LOGGER.debug("{} is not a config subsystem config file",c.getFinalname()); + LOG.debug("{} is not a config subsystem config file",c.getFinalname()); } } return snapShotHolders; 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 2bff906900..4ea3c5ff75 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 @@ -7,11 +7,10 @@ */ package org.opendaylight.controller.configpusherfeature.internal; +import com.google.common.base.Preconditions; import java.util.LinkedHashSet; import java.util.List; - import javax.xml.bind.JAXBException; - import org.apache.felix.utils.version.VersionRange; import org.apache.felix.utils.version.VersionTable; import org.apache.karaf.features.Dependency; @@ -21,8 +20,6 @@ import org.osgi.framework.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; - /* * Wrap a Feature for the purposes of extracting the FeatureConfigSnapshotHolders from * its underlying ConfigFileInfo's and those of its children recursively @@ -30,7 +27,7 @@ import com.google.common.base.Preconditions; * Delegates the the contained feature and provides additional methods. */ public class ChildAwareFeatureWrapper extends AbstractFeatureWrapper implements Feature { - private static final Logger LOGGER = LoggerFactory.getLogger(ChildAwareFeatureWrapper.class); + private static final Logger LOG = LoggerFactory.getLogger(ChildAwareFeatureWrapper.class); private FeaturesService featuresService= null; protected ChildAwareFeatureWrapper(Feature f) { @@ -79,7 +76,7 @@ public class ChildAwareFeatureWrapper extends AbstractFeatureWrapper implements f = new FeatureConfigSnapshotHolder(h,this); snapShotHolders.add(f); } catch (JAXBException e) { - LOGGER.debug("{} is not a config subsystem config file",h.getFileInfo().getFinalname()); + LOG.debug("{} is not a config subsystem config file",h.getFileInfo().getFinalname()); } } } @@ -97,8 +94,8 @@ public class ChildAwareFeatureWrapper extends AbstractFeatureWrapper implements Version v = VersionTable.getVersion(f.getVersion()); if (range.contains(v) && (fi == null || VersionTable.getVersion(fi.getVersion()).compareTo(v) < 0)) { - fi = f; - break; + fi = f; + break; } } } 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 2af4719994..72abca1c99 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 @@ -9,7 +9,6 @@ package org.opendaylight.controller.configpusherfeature.internal; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; - import org.apache.karaf.features.FeatureEvent; import org.apache.karaf.features.FeaturesListener; import org.apache.karaf.features.FeaturesService; @@ -19,7 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ConfigFeaturesListener implements FeaturesListener, AutoCloseable { - private static final Logger LOGGER = LoggerFactory.getLogger(ConfigFeaturesListener.class); + private static final Logger LOG = LoggerFactory.getLogger(ConfigFeaturesListener.class); private static final int QUEUE_SIZE = 1000; private BlockingQueue queue = new LinkedBlockingQueue(QUEUE_SIZE); Thread pushingThread = null; @@ -36,7 +35,7 @@ public class ConfigFeaturesListener implements FeaturesListener, AutoCloseable @Override public void repositoryEvent(RepositoryEvent event) { - LOGGER.debug("Repository: " + event.getType() + " " + event.getRepository()); + LOG.debug("Repository: {} {}", event.getType(), event.getRepository()); } @Override 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 1a40bb34d7..5c257effba 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 @@ -7,11 +7,11 @@ */ package org.opendaylight.controller.configpusherfeature.internal; +import com.google.common.collect.LinkedHashMultimap; import java.util.ArrayList; import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; - import org.apache.karaf.features.Feature; import org.apache.karaf.features.FeatureEvent; import org.apache.karaf.features.FeatureEvent.EventType; @@ -20,10 +20,8 @@ import org.opendaylight.controller.config.persist.api.ConfigPusher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.LinkedHashMultimap; - public class ConfigPushingRunnable implements Runnable { - private static final Logger LOGGER = LoggerFactory.getLogger(ConfigPushingRunnable.class); + private static final Logger LOG = LoggerFactory.getLogger(ConfigPushingRunnable.class); private static final int POLL_TIME = 1; private BlockingQueue queue; private FeatureConfigPusher configPusher; @@ -49,14 +47,14 @@ public class ConfigPushingRunnable implements Runnable { processFeatureEvent(event,toInstall); } } else if(toInstall.isEmpty()) { - LOGGER.error("ConfigPushingRunnable - exiting"); + LOG.error("ConfigPushingRunnable - exiting"); return; } } catch (InterruptedException e) { - LOGGER.error("ConfigPushingRunnable - interupted"); + LOG.error("ConfigPushingRunnable - interupted"); interuppted = true; } catch (Exception e) { - LOGGER.error("Exception while processing features {}", e); + LOG.error("Exception while processing features ", e); } } } @@ -73,7 +71,7 @@ public class ConfigPushingRunnable implements Runnable { protected void logPushResult(LinkedHashMultimap results) { for(Feature f:results.keySet()) { - LOGGER.info("Pushed configs for feature {} {}",f,results.get(f)); + 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/FeatureConfigSnapshotHolder.java b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigSnapshotHolder.java index 5ab5c959f7..1bce5f2364 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 @@ -7,27 +7,24 @@ */ package org.opendaylight.controller.configpusherfeature.internal; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.SortedSet; - import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; - import org.apache.karaf.features.ConfigFileInfo; import org.apache.karaf.features.Feature; import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder; import org.opendaylight.controller.config.persist.storage.file.xml.model.ConfigSnapshot; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; - /* * A ConfigSnapshotHolder that can track all the additional information * relavent to the fact we are getting these from a Feature. -- 2.36.6