Instance identifier in XML output was added

In class XmlDocumentUtils was added support for xml output for
instance-identifier YANG type.

Change-Id: I7115dbe1ecf09ba74d8881f7157643e4ba0416a9
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java
index 9e999be49197b1a0a9ec75c6d7f230e5d01ac466..8e788003220ec7cbcf9e6d6df76653f7bbdf1345 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtils.java
@@ -10,8 +10,12 @@ package org.opendaylight.yangtools.yang.data.impl.codec.xml;
 import static com.google.common.base.Preconditions.checkState;
 
 import java.net.URI;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Random;
 import java.util.Set;
 
 import javax.activation.UnsupportedDataTypeException;
@@ -22,6 +26,9 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.AttributesContainer;
 import org.opendaylight.yangtools.yang.data.api.CompositeNode;
+import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.Node;
 import org.opendaylight.yangtools.yang.data.api.SimpleNode;
 import org.opendaylight.yangtools.yang.data.impl.ImmutableCompositeNode;
@@ -39,6 +46,7 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -142,7 +150,6 @@ public class XmlDocumentUtils {
 
     public static void writeValueByType(Element element, SimpleNode<?> node, TypeDefinition<?> type,
             DataSchemaNode schema, XmlCodecProvider codecProvider) {
-
         TypeDefinition<?> baseType = resolveBaseTypeFrom(type);
 
         if (baseType instanceof IdentityrefTypeDefinition) {
@@ -156,9 +163,42 @@ public class XmlDocumentUtils {
                 element.setTextContent(prefix + ":" + value.getLocalName());
             } else {
                 Object value = node.getValue();
-                logger.debug("Value of {}:{} is not instance of QName but is {}", baseType.getQName().getNamespace(), //
-                        baseType.getQName().getLocalName(), //
-                        value != null ? value.getClass() : "null");
+                logger.debug("Value of {}:{} is not instance of QName but is {}", baseType.getQName().getNamespace(),
+                        baseType.getQName().getLocalName(), value != null ? value.getClass() : "null");
+                if (value != null) {
+                    element.setTextContent(String.valueOf(value));
+                }
+            }
+        } else if (baseType instanceof InstanceIdentifierTypeDefinition) {
+            if (node.getValue() instanceof InstanceIdentifier) {
+                // Map< key = namespace, value = prefix>
+                Map<String, String> prefixes = new HashMap<>();
+                InstanceIdentifier instanceIdentifier = (InstanceIdentifier) node.getValue();
+                StringBuilder textContent = new StringBuilder();
+                for (PathArgument pathArgument : instanceIdentifier.getPath()) {
+                    textContent.append("/");
+                    writeIdentifierWithNamespacePrefix(element, textContent, pathArgument.getNodeType(), prefixes);
+                    if (pathArgument instanceof NodeIdentifierWithPredicates) {
+                        Map<QName, Object> predicates = ((NodeIdentifierWithPredicates) pathArgument).getKeyValues();
+
+                        for (QName keyValue : predicates.keySet()) {
+                            String predicateValue = String.valueOf(predicates.get(keyValue));
+                            textContent.append("[");
+                            writeIdentifierWithNamespacePrefix(element, textContent, keyValue, prefixes);
+                            textContent.append("='");
+                            textContent.append(predicateValue);
+                            textContent.append("'");
+                            textContent.append("]");
+                        }
+                    }
+                }
+                element.setTextContent(textContent.toString());
+
+            } else {
+                Object value = node.getValue();
+                logger.debug("Value of {}:{} is not instance of InstanceIdentifier but is {}", baseType.getQName()
+                        .getNamespace(), //
+                        baseType.getQName().getLocalName(), value != null ? value.getClass() : "null");
                 if (value != null) {
                     element.setTextContent(String.valueOf(value));
                 }
@@ -182,6 +222,39 @@ public class XmlDocumentUtils {
         }
     }
 
+    private static void writeIdentifierWithNamespacePrefix(Element element, StringBuilder textContent, QName qName,
+            Map<String, String> prefixes) {
+        String namespace = qName.getNamespace().toString();
+        String prefix = prefixes.get(namespace);
+        if (prefix == null) {
+            prefix = qName.getPrefix();
+            if (prefix == null || prefix.isEmpty() || prefixes.containsValue(prefix)) {
+                prefix = generateNewPrefix(prefixes.values());
+            }
+        }
+
+        element.setAttribute("xmlns:" + prefix, namespace.toString());
+        textContent.append(prefix);
+        prefixes.put(namespace, prefix);
+
+        textContent.append(":");
+        textContent.append(qName.getLocalName());
+    }
+
+    private static String generateNewPrefix(Collection<String> prefixes) {
+        StringBuilder result = null;
+        Random random = new Random();
+        do {
+            result = new StringBuilder();
+            for (int i = 0; i < 4; i++) {
+                int randomNumber = 0x61 + (Math.abs(random.nextInt()) % 26);
+                result.append(Character.toChars(randomNumber));
+            }
+        } while (prefixes.contains(result.toString()));
+
+        return result.toString();
+    }
+
     public final static TypeDefinition<?> resolveBaseTypeFrom(TypeDefinition<?> type) {
         TypeDefinition<?> superType = type;
         while (superType.getBaseType() != null) {

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
index ec51b47f68084ba53de0f9755cbebbed16fdd16a..7465b3478c871bbb98b04ecea062e31d5cf3cb39 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
@@ -915,8 +915,8 @@ public class YangParserTest {
 
     @Test
     public void testSubmodules() {
-        String yangFilePath = getClass().getResource(FS + "submodule-test" + FS + "subfoo.yang").getPath();
-        String directoryPath = getClass().getResource(FS + "model").getPath();
+        String yangFilePath = getClass().getResource("/submodule-test/subfoo.yang").getPath();
+        String directoryPath = getClass().getResource("/model").getPath();
 
         File directory = new File(directoryPath);
         File yangFile = new File(yangFilePath);