Fix checkstyle

[netconf.git] / netconf / netconf-util / src / main / java / org / opendaylight / netconf / util / messages / SendErrorExceptionUtil.java

diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SendErrorExceptionUtil.java b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SendErrorExceptionUtil.java
index 4768fad00ecea66354528281f700e8ff74f3afe5..4f93674224edd29c5d5465a69ffc9882b6669510 100644 (file)
--- a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SendErrorExceptionUtil.java
+++ b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SendErrorExceptionUtil.java
@@ -12,12 +12,12 @@ import com.google.common.base.Preconditions;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
-import org.opendaylight.controller.config.util.xml.DocumentedException;
-import org.opendaylight.controller.config.util.xml.XmlMappingConstants;
-import org.opendaylight.controller.config.util.xml.XmlUtil;
+import javax.xml.XMLConstants;
+import org.opendaylight.netconf.api.DocumentedException;
 import org.opendaylight.netconf.api.NetconfMessage;
 import org.opendaylight.netconf.api.NetconfSession;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
+import org.opendaylight.netconf.api.xml.XmlUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Attr;
@@ -28,18 +28,20 @@ import org.w3c.dom.NamedNodeMap;
 public final class SendErrorExceptionUtil {
     private static final Logger LOG = LoggerFactory.getLogger(SendErrorExceptionUtil.class);
 
-    private SendErrorExceptionUtil() {}
+    private SendErrorExceptionUtil() {
+
+    }
 
     public static void sendErrorMessage(final NetconfSession session,
             final DocumentedException sendErrorException) {
-        LOG.trace("Sending error {}", sendErrorException.getMessage(), sendErrorException);
+        LOG.trace("Sending error", sendErrorException);
         final Document errorDocument = createDocument(sendErrorException);
         ChannelFuture channelFuture = session.sendMessage(new NetconfMessage(errorDocument));
         channelFuture.addListener(new SendErrorVerifyingListener(sendErrorException));
     }
 
     public static void sendErrorMessage(final Channel channel, final DocumentedException sendErrorException) {
-        LOG.trace("Sending error {}", sendErrorException.getMessage(), sendErrorException);
+        LOG.trace("Sending error", sendErrorException);
         final Document errorDocument = createDocument(sendErrorException);
         ChannelFuture channelFuture = channel.writeAndFlush(new NetconfMessage(errorDocument));
         channelFuture.addListener(new SendErrorVerifyingListener(sendErrorException));
@@ -62,18 +64,20 @@ public final class SendErrorExceptionUtil {
             final DocumentedException sendErrorException) {
         try {
             final Element incommingRpc = incommingDocument.getDocumentElement();
-            Preconditions.checkState(incommingRpc.getTagName().equals(XmlNetconfConstants.RPC_KEY),
+            Preconditions.checkState(
+                XmlNetconfConstants.RPC_KEY.equals(incommingRpc.getLocalName())
+                && XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0.equals(incommingRpc.getNamespaceURI()),
                     "Missing %s element", XmlNetconfConstants.RPC_KEY);
 
             final Element rpcReply = errorDocument.getDocumentElement();
-            Preconditions.checkState(rpcReply.getTagName().equals(XmlMappingConstants.RPC_REPLY_KEY),
-                    "Missing %s element", XmlMappingConstants.RPC_REPLY_KEY);
+            Preconditions.checkState(rpcReply.getTagName().equals(XmlNetconfConstants.RPC_REPLY_KEY),
+                    "Missing %s element", XmlNetconfConstants.RPC_REPLY_KEY);
 
             final NamedNodeMap incomingAttributes = incommingRpc.getAttributes();
             for (int i = 0; i < incomingAttributes.getLength(); i++) {
                 final Attr attr = (Attr) incomingAttributes.item(i);
                 // skip namespace
-                if (attr.getNodeName().equals(XmlUtil.XMLNS_ATTRIBUTE_KEY)) {
+                if (attr.getNodeName().equals(XMLConstants.XMLNS_ATTRIBUTE)) {
                     continue;
                 }
                 rpcReply.setAttributeNode((Attr) errorDocument.importNode(attr, true));
@@ -99,7 +103,7 @@ public final class SendErrorExceptionUtil {
         }
 
         @Override
-        public void operationComplete(final ChannelFuture channelFuture) throws Exception {
+        public void operationComplete(final ChannelFuture channelFuture) {
             Preconditions.checkState(channelFuture.isSuccess(), "Unable to send exception %s", sendErrorException,
                     channelFuture.cause());
         }