X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Futil%2FNetconfUtil.java;h=0269bcccb989492e69b616fc955545ca49509f31;hp=9443f93f920f9720e13908c6319a139f4be0f6b0;hb=ebd9aba9e844229de613a2b60b5d21119fcee968;hpb=31b7a44c89d1057489338492fcf62a64147bea24 diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/NetconfUtil.java b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/NetconfUtil.java index 9443f93f92..0269bcccb9 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/NetconfUtil.java +++ b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/NetconfUtil.java @@ -8,21 +8,14 @@ package org.opendaylight.controller.netconf.util; import com.google.common.base.Preconditions; + import org.opendaylight.controller.netconf.api.NetconfDocumentedException; -import org.opendaylight.controller.netconf.api.NetconfMessage; +import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.controller.netconf.util.xml.XmlElement; -import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; import org.opendaylight.controller.netconf.util.xml.XmlUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; -import org.xml.sax.SAXException; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; public final class NetconfUtil { @@ -30,29 +23,6 @@ public final class NetconfUtil { private NetconfUtil() {} - public static NetconfMessage createMessage(final File f) { - Preconditions.checkNotNull(f, "File parameter was null"); - try { - return createMessage(new FileInputStream(f)); - } catch (final FileNotFoundException e) { - logger.warn("File {} not found.", f, e); - } - return null; - } - - public static NetconfMessage createMessage(final InputStream is) { - Preconditions.checkNotNull(is, "InputStream parameter was null"); - Document doc = null; - try { - doc = XmlUtil.readXmlToDocument(is); - } catch (final IOException e) { - logger.warn("Error ocurred while parsing stream.", e); - } catch (final SAXException e) { - logger.warn("Error ocurred while final parsing stream.", e); - } - return (doc == null) ? null : new NetconfMessage(doc); - } - public static Document checkIsMessageOk(Document response) throws NetconfDocumentedException { XmlElement element = XmlElement.fromDomDocument(response); Preconditions.checkState(element.getName().equals(XmlNetconfConstants.RPC_REPLY_KEY));