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>
(cherry picked from commit a298f385bbb5a1ca9aeca03516bfac81c22bb1fd)

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 db45d54a17d221e6ebba1e82ca1b64415b1d53c2..70df22d5d85c35db5f34bcbc804b5d8babb1fab4 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
@@ -49,8 +49,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.");
@@ -196,7 +196,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());
             }