Decouple config and netconf subsystems.

[controller.git] / opendaylight / netconf / netconf-client / src / main / java / org / opendaylight / controller / netconf / client / NetconfClientSessionNegotiator.java

diff --git a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java
index f4017fbe5897521e5589f36e987abdc454cfb895..17f5608a1c3d0bafffe134f289ffee809324b572 100644 (file)
--- a/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java
+++ b/opendaylight/netconf/netconf-client/src/main/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiator.java
@@ -20,6 +20,7 @@ import io.netty.util.concurrent.Promise;
 import java.util.Collection;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpression;
+import org.opendaylight.controller.config.util.xml.XmlUtil;
 import org.opendaylight.controller.netconf.api.NetconfClientSessionPreferences;
 import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
 import org.opendaylight.controller.netconf.api.NetconfMessage;
@@ -30,7 +31,6 @@ import org.opendaylight.controller.netconf.nettyutil.handler.exi.NetconfStartExi
 import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessage;
 import org.opendaylight.controller.netconf.util.messages.NetconfMessageUtil;
 import org.opendaylight.controller.netconf.util.xml.XMLNetconfUtil;
-import org.opendaylight.controller.netconf.util.xml.XmlUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -105,7 +105,7 @@ public class NetconfClientSessionNegotiator extends
                 && containsExi10Capability(sessionPreferences.getHelloMessage().getDocument());
     }
 
-    private boolean containsExi10Capability(final Document doc) {
+    private static boolean containsExi10Capability(final Document doc) {
         final NodeList nList = doc.getElementsByTagName(XmlNetconfConstants.CAPABILITY);
         for (int i = 0; i < nList.getLength(); i++) {
             if (nList.item(i).getTextContent().contains(EXI_1_0_CAPABILITY_MARKER)) {
@@ -115,7 +115,7 @@ public class NetconfClientSessionNegotiator extends
         return false;
     }
 
-    private long extractSessionId(final Document doc) {
+    private static long extractSessionId(final Document doc) {
         String textContent = getSessionIdWithXPath(doc, sessionIdXPath);
         if (Strings.isNullOrEmpty(textContent)) {
             textContent = getSessionIdWithXPath(doc, sessionIdXPathNoNamespace);
@@ -127,7 +127,7 @@ public class NetconfClientSessionNegotiator extends
         return Long.valueOf(textContent);
     }
 
-    private String getSessionIdWithXPath(final Document doc, final XPathExpression sessionIdXPath) {
+    private static String getSessionIdWithXPath(final Document doc, final XPathExpression sessionIdXPath) {
         final Node sessionIdNode = (Node) XmlUtil.evaluateXPath(sessionIdXPath, doc, XPathConstants.NODE);
         return sessionIdNode != null ? sessionIdNode.getTextContent() : null;
     }