Fix findbugs violations in netconf

[netconf.git] / netconf / tools / netconf-testtool / src / main / java / org / opendaylight / netconf / test / tool / rpc / SimulatedGetConfig.java

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java
index 51976445c2c3cba5feb6189d9b9189364c391f00..f7b942125e532fb2da446e5cf46dd5a2bd0138a7 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java
@@ -11,7 +11,6 @@ package org.opendaylight.netconf.test.tool.rpc;
 import com.google.common.base.Optional;
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 import org.opendaylight.controller.config.util.xml.DocumentedException;
 import org.opendaylight.controller.config.util.xml.XmlElement;
@@ -30,44 +29,42 @@ public class SimulatedGetConfig extends AbstractConfigNetconfOperation {
     private static final Logger LOG = LoggerFactory
             .getLogger(SimulatedGetConfig.class);
 
-    public SimulatedGetConfig(final String netconfSessionIdForReporting, final DataList storage, final Optional<File> initialConfigXMLFile) {
+    public SimulatedGetConfig(final String netconfSessionIdForReporting, final DataList storage,
+                              final Optional<File> initialConfigXMLFile) {
         super(null, netconfSessionIdForReporting);
 
-        if(initialConfigXMLFile.isPresent()) {
+        if (initialConfigXMLFile.isPresent()) {
             LOG.info("File is present: {}", initialConfigXMLFile.get()
                     .getName());
             this.storage = loadInitialConfigXMLFile(initialConfigXMLFile.get());
-        }
-        else {
+        } else {
             this.storage = storage;
         }
     }
 
-    private final DataList loadInitialConfigXMLFile( final File file ) {
+    private static DataList loadInitialConfigXMLFile(final File file) {
         LOG.info("Loading initial config xml file: {}", file.getName());
         DataList configData = new DataList();
-        List<XmlElement> xmlElementList = Collections.emptyList();
         try {
             Element element = XmlUtil.readXmlToElement(file);
             XmlElement xmlElement = XmlElement.fromDomElement(element);
-            xmlElementList = xmlElement.getChildElements();
+            List<XmlElement> xmlElementList = xmlElement.getChildElements();
             configData.setConfigList(xmlElementList);
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             LOG.info("IO exception loading xml file: {} ", e.getMessage());
 
-        }
-        catch (SAXException e) {
+        } catch (SAXException e) {
             LOG.info("SAXException {}", e.getMessage());
         }
         return configData;
     }
 
     @Override
-    protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) throws DocumentedException {
-        final Element element = XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.<String>absent());
+    protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement)
+            throws DocumentedException {
+        final Element element = XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent());
 
-        for(final XmlElement e : storage.getConfigList()) {
+        for (final XmlElement e : storage.getConfigList()) {
             final Element domElement = e.getDomElement();
             element.appendChild(element.getOwnerDocument().importNode(domElement, true));
         }