Cleanup RFC6020_YIN_NAMESPACE usage

In export write we really want to use RFC6020_YIN_NAMESPACE_STRING,
not RFC6020_YIN_NAMESPACE, making references proper constants.

Change-Id: I3e9c7c745fbd2dd97fcb35e47cdb0920a81cc596
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java
index 9e022e360121b2d7aa16ce491468b570a16f9a10..d887331744ffe570d9ae1a724ac888a7b23b26d4 100644 (file)
--- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java
+++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SingleModuleYinStatementWriter.java
@@ -51,8 +51,8 @@ final class SingleModuleYinStatementWriter implements StatementTextWriter {
         try {
             final String defaultNs = writer.getNamespaceContext().getNamespaceURI(XMLConstants.NULL_NS_URI);
             if (defaultNs == null) {
-                writer.setDefaultNamespace(YangConstants.RFC6020_YIN_NAMESPACE.toString());
-            } else if (!YangConstants.RFC6020_YIN_NAMESPACE.toString().equals(defaultNs)) {
+                writer.setDefaultNamespace(YangConstants.RFC6020_YIN_NAMESPACE_STRING);
+            } else if (!YangConstants.RFC6020_YIN_NAMESPACE_STRING.equals(defaultNs)) {
                 // FIXME: Implement support for exporting YIN as part of other XML document.
                 throw new UnsupportedOperationException(
                         "Not implemented support for nesting YIN in different XML element.");
@@ -198,7 +198,7 @@ final class SingleModuleYinStatementWriter implements StatementTextWriter {
 
     private void declareXmlNamespaces() {
         try {
-            writer.writeDefaultNamespace(YangConstants.RFC6020_YIN_NAMESPACE.toString());
+            writer.writeDefaultNamespace(YangConstants.RFC6020_YIN_NAMESPACE_STRING);
             for (final Entry<String, URI> nsDeclaration : prefixToNamespace.entrySet()) {
                 writer.writeNamespace(nsDeclaration.getKey(), nsDeclaration.getValue().toString());
             }