From: Dana Kutenicsova Date: Wed, 5 Oct 2016 20:38:38 +0000 (+0200) Subject: Removed sonar warnings. X-Git-Tag: release/carbon~393 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=8b1ea7f69a0183c988d3861a8b6c90e465d687ae Removed sonar warnings. Change-Id: I53136e343bd54e9f0a687044037bc61deebb05b4 Signed-off-by: Dana Kutenicsova --- 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 f43765901d..eec7882529 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 @@ -14,6 +14,7 @@ import java.io.File; import java.io.FileInputStream; import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import javax.xml.bind.JAXBException; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.stream.XMLStreamException; @@ -57,8 +58,8 @@ public class AbstractFeatureWrapper implements Feature { * Get FeatureConfigSnapshotHolders appropriate to feed to the config subsystem * from the underlying Feature Config files */ - public LinkedHashSet getFeatureConfigSnapshotHolders() throws Exception { - final LinkedHashSet snapShotHolders = new LinkedHashSet<>(); + public Set getFeatureConfigSnapshotHolders() throws Exception { + final Set snapShotHolders = new LinkedHashSet<>(); for(final ConfigFileInfo c: getConfigurationFiles()) { // Skip non config snapshot XML files if(isConfigSnapshot(c.getFinalname())) { 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 672784a54b..a9d06853a2 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 @@ -11,6 +11,7 @@ import com.google.common.base.Optional; import com.google.common.base.Preconditions; import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.apache.felix.utils.version.VersionRange; import org.apache.felix.utils.version.VersionTable; import org.apache.karaf.features.Dependency; @@ -52,17 +53,17 @@ public class ChildAwareFeatureWrapper extends AbstractFeatureWrapper implements * Get FeatureConfigSnapshotHolders appropriate to feed to the config subsystem * from the underlying Feature Config files and those of its children recursively */ - public LinkedHashSet getChildFeatures() throws Exception { + public Set getChildFeatures() throws Exception { List dependencies = feature.getDependencies(); - LinkedHashSet childFeatures = new LinkedHashSet<>(); + Set childFeatures = new LinkedHashSet<>(); if(dependencies != null) { for(Dependency dependency: dependencies) { Feature fi = extractFeatureFromDependency(dependency); - if(fi != null) { - if(featuresService.getFeature(fi.getName(), fi.getVersion()) == null) { + if (fi != null) { + if (featuresService.getFeature(fi.getName(), fi.getVersion()) == null) { LOG.warn("Feature: {}, {} is missing from features service. Skipping", fi.getName(), fi.getVersion()); } else { - ChildAwareFeatureWrapper wrappedFeature = new ChildAwareFeatureWrapper(fi,featuresService); + ChildAwareFeatureWrapper wrappedFeature = new ChildAwareFeatureWrapper(fi, featuresService); childFeatures.add(wrappedFeature); } } @@ -72,8 +73,8 @@ public class ChildAwareFeatureWrapper extends AbstractFeatureWrapper implements } @Override - public LinkedHashSet getFeatureConfigSnapshotHolders() throws Exception { - LinkedHashSet snapShotHolders = new LinkedHashSet<>(); + public Set getFeatureConfigSnapshotHolders() throws Exception { + Set snapShotHolders = new LinkedHashSet<>(); for(ChildAwareFeatureWrapper c: getChildFeatures()) { for(FeatureConfigSnapshotHolder h: c.getFeatureConfigSnapshotHolders()) { final Optional featureConfigSnapshotHolder = getFeatureConfigSnapshotHolder(h.getFileInfo()); 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 e94d6155c9..cfdad56094 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 @@ -59,7 +59,7 @@ public class ConfigPushingRunnable implements Runnable { } } - protected void processFeatureEvent(FeatureEvent event, List toInstall) throws InterruptedException, Exception { + protected void processFeatureEvent(FeatureEvent event, List toInstall) throws Exception { if(event.getType() == EventType.FeatureInstalled) { toInstall.add(event.getFeature()); LinkedHashMultimap result = configPusher.pushConfigs(toInstall); 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 f11da079c6..50757fb7b9 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 @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import org.apache.karaf.features.Feature; import org.apache.karaf.features.FeaturesService; import org.opendaylight.controller.config.persist.api.ConfigPusher; @@ -36,7 +37,7 @@ public class FeatureConfigPusher { * chains. Also, preserves the *original* Feature chain for which we pushed the config. * (which is handy for logging). */ - LinkedHashSet pushedConfigs = new LinkedHashSet<>(); + Set pushedConfigs = new LinkedHashSet<>(); /* * LinkedHashMultimap to track which configs we pushed for each Feature installation * For future use @@ -64,7 +65,7 @@ public class FeatureConfigPusher { for (Feature feature : features) { - LinkedHashSet configSnapShots = pushConfig(feature); + Set configSnapShots = pushConfig(feature); if (!configSnapShots.isEmpty()) { pushedFeatures.putAll(feature, configSnapShots); } @@ -72,8 +73,8 @@ public class FeatureConfigPusher { return pushedFeatures; } - private LinkedHashSet pushConfig(final Feature feature) throws Exception { - LinkedHashSet configs = new LinkedHashSet<>(); + private Set pushConfig(final Feature feature) throws Exception { + Set configs = new LinkedHashSet<>(); if(isInstalled(feature)) { // FIXME Workaround for BUG-2836, features service returns null for feature: standard-condition-webconsole_0_0_0, 3.0.1 if(featuresService.getFeature(feature.getName(), feature.getVersion()) == null) { @@ -91,7 +92,7 @@ public class FeatureConfigPusher { } private boolean isInstalled(final Feature feature) { - for(int retries=0;retries installedFeatures = Arrays.asList(featuresService.listInstalledFeatures()); if(installedFeatures.contains(feature)) { @@ -100,12 +101,7 @@ public class FeatureConfigPusher { LOG.warn("Karaf featuresService.listInstalledFeatures() has not yet finished installing feature (retry {}) {} {}",retries,feature.getName(),feature.getVersion()); } } catch (Exception e) { - if(retries < MAX_RETRIES) { - LOG.warn("Karaf featuresService.listInstalledFeatures() has thrown an exception, retry {}", retries, e); - } else { - LOG.error("Giving up on Karaf featuresService.listInstalledFeatures() which has thrown an exception, retry {}", retries, e); - throw e; - } + LOG.warn("Karaf featuresService.listInstalledFeatures() has thrown an exception, retry {}", retries, e); } try { Thread.sleep(RETRY_PAUSE_MILLIS); @@ -117,8 +113,9 @@ public class FeatureConfigPusher { return false; } - private LinkedHashSet pushConfig(final LinkedHashSet configs, final Feature feature) throws InterruptedException { - LinkedHashSet configsToPush = new LinkedHashSet<>(configs); + private Set pushConfig(final Set configs, final Feature feature) + throws InterruptedException { + Set configsToPush = new LinkedHashSet<>(configs); configsToPush.removeAll(pushedConfigs); if (!configsToPush.isEmpty()) { @@ -134,7 +131,7 @@ public class FeatureConfigPusher { pushedConfigs.addAll(configsToPush); } - LinkedHashSet configsPushed = new LinkedHashSet<>(pushedConfigs); + Set configsPushed = new LinkedHashSet<>(pushedConfigs); configsPushed.retainAll(configs); return configsPushed; } 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 135211727a..70f7366895 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 @@ -71,7 +71,7 @@ public class FeatureConfigSnapshotHolder implements ConfigSnapshotHolder { xif.setProperty(XMLInputFactory.SUPPORT_DTD, false); XMLStreamReader xsr = xif.createXMLStreamReader(new StreamSource(new File(fileInfo.getFinalname()))); - unmarshalled = ((ConfigSnapshot) um.unmarshal(xsr)); + unmarshalled = (ConfigSnapshot) um.unmarshal(xsr); } /* * (non-Javadoc) 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 c941e89435..5ce58ef053 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 @@ -23,14 +23,12 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer; public class FeatureServiceCustomizer implements ServiceTrackerCustomizer, AutoCloseable { private ConfigPusher configPusher = null; - private ConfigFeaturesListener configFeaturesListener = null; private ServiceRegistration registration; FeatureServiceCustomizer(ConfigPusher c) { configPusher = c; } - @Override public FeaturesService addingService(ServiceReference reference) { BundleContext bc = reference.getBundle().getBundleContext(); @@ -50,7 +48,7 @@ public class FeatureServiceCustomizer implements ServiceTrackerCustomizer reference, FeaturesService service) { // we don't care if the properties change - } @Override @@ -75,5 +72,4 @@ public class FeatureServiceCustomizer implements ServiceTrackerCustomizer