X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fnetconf-netty-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fnettyutil%2Fhandler%2Fexi%2FNetconfStartExiMessage.java;h=2f7a44db083845f3b7c54b3c809f1954ef431e93;hb=894d3e240e70c339f15cf73eabcff646d58051cc;hp=b7e94bb77fa05ac6864789600fdc4b7375a8313c;hpb=b9ec0da5de634765a97034df88a1250d89fa12c4;p=netconf.git

diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java
index b7e94bb77f..2f7a44db08 100644
--- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java
+++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java
@@ -11,6 +11,7 @@ package org.opendaylight.netconf.nettyutil.handler.exi;
 import com.google.common.annotations.VisibleForTesting;
 import java.util.ArrayList;
 import java.util.List;
+import org.opendaylight.netconf.api.NamespaceURN;
 import org.opendaylight.netconf.api.NetconfMessage;
 import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
 import org.opendaylight.netconf.api.xml.XmlUtil;
@@ -31,15 +32,12 @@ public final class NetconfStartExiMessage extends NetconfMessage {
 
     public static NetconfStartExiMessage create(final EXIParameters exiOptions, final String messageId) {
         final Document doc = XmlUtil.newDocument();
-        final Element rpcElement = doc.createElementNS(XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0,
-                XmlNetconfConstants.RPC_KEY);
-        rpcElement.setAttributeNS(XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0,
-                XmlNetconfConstants.MESSAGE_ID, messageId);
+        final Element rpcElement = doc.createElementNS(NamespaceURN.BASE, XmlNetconfConstants.RPC_KEY);
+        rpcElement.setAttributeNS(NamespaceURN.BASE, XmlNetconfConstants.MESSAGE_ID, messageId);
 
         // TODO draft http://tools.ietf.org/html/draft-varga-netconf-exi-capability-02#section-3.5.1 has no namespace
         // for start-exi element in xml
-        final Element startExiElement = doc.createElementNS(XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_EXI_1_0,
-                START_EXI);
+        final Element startExiElement = doc.createElementNS(NamespaceURN.EXI, START_EXI);
 
         addAlignment(exiOptions, doc, startExiElement);
         addFidelity(exiOptions, doc, startExiElement);
@@ -53,8 +51,7 @@ public final class NetconfStartExiMessage extends NetconfMessage {
 
     private static void addAlignment(final EXIParameters exiOptions, final Document doc,
             final Element startExiElement) {
-        final Element alignmentElement = doc.createElementNS(XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_EXI_1_0,
-            EXIParameters.EXI_PARAMETER_ALIGNMENT);
+        final Element alignmentElement = doc.createElementNS(NamespaceURN.EXI, EXIParameters.EXI_PARAMETER_ALIGNMENT);
 
         alignmentElement.setTextContent(exiOptions.getAlignment());
         startExiElement.appendChild(alignmentElement);
@@ -69,8 +66,7 @@ public final class NetconfStartExiMessage extends NetconfMessage {
         createFidelityElement(doc, fidelityElements, exiOptions.getPreservePrefixes());
 
         if (!fidelityElements.isEmpty()) {
-            final Element fidelityElement = doc.createElementNS(
-                    XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_EXI_1_0, EXIParameters.EXI_PARAMETER_FIDELITY);
+            final Element fidelityElement = doc.createElementNS(NamespaceURN.EXI, EXIParameters.EXI_PARAMETER_FIDELITY);
             for (final Element element : fidelityElements) {
                 fidelityElement.appendChild(element);
             }
@@ -81,8 +77,7 @@ public final class NetconfStartExiMessage extends NetconfMessage {
     private static void addSchema(final EXIParameters exiOptions, final Document doc, final Element startExiElement) {
         final String schema = exiOptions.getSchema();
         if (schema != null) {
-            final Element child = doc.createElementNS(XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_EXI_1_0,
-                EXIParameters.EXI_PARAMETER_SCHEMAS);
+            final Element child = doc.createElementNS(NamespaceURN.EXI, EXIParameters.EXI_PARAMETER_SCHEMAS);
             child.setTextContent(schema);
             startExiElement.appendChild(child);
         }
@@ -91,7 +86,7 @@ public final class NetconfStartExiMessage extends NetconfMessage {
     private static void createFidelityElement(final Document doc, final List<Element> elements,
                                               final String fidelity) {
         if (fidelity != null) {
-            elements.add(doc.createElementNS(XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_EXI_1_0, fidelity));
+            elements.add(doc.createElementNS(NamespaceURN.EXI, fidelity));
         }
     }
 }