Revert "Revert "Bug 3874: Support of yang modeled AnyXML - API""

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / codec / xml / XMLStreamNormalizedNodeStreamWriter.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java
index 9c62fbb1d0bc212b27e82a7f1c718cad5c74e85f..17343e7f30fbef489dfca0106574ccce9d766fee 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java
@@ -79,6 +79,7 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode
      *
      * @param writer Output {@link XMLStreamWriter}
      * @param context Associated {@link SchemaContext}.
+     * @param path path
      *
      * @return A new {@link NormalizedNodeStreamWriter}
      */
@@ -101,7 +102,7 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode
         try {
             writeStartElement(qname);
             if (value != null) {
-                streamUtils.writeValue(writer, type, value);
+                streamUtils.writeValue(writer, type, value, qname.getModule());
             }
             writer.writeEndElement();
         } catch (XMLStreamException e) {
@@ -113,7 +114,7 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode
         try {
             writeStartElement(qname);
             if (value != null) {
-                streamUtils.writeValue(writer, schemaNode, value);
+                streamUtils.writeValue(writer, schemaNode, value, qname.getModule());
             }
             writer.writeEndElement();
         } catch (XMLStreamException e) {
@@ -124,9 +125,10 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode
     private void writeElement(final QName qname, final SchemaNode schemaNode, final Object value, final Map<QName, String> attributes) throws IOException {
         try {
             writeStartElement(qname);
+
             writeAttributes(attributes);
             if (value != null) {
-                streamUtils.writeValue(writer, schemaNode, value);
+                streamUtils.writeValue(writer, schemaNode, value, qname.getModule());
             }
             writer.writeEndElement();
         } catch (XMLStreamException e) {
@@ -164,25 +166,31 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode
     }
 
     @Override
-    public void leafSetEntryNode(final Object value, final Map<QName, String> attributes) throws IOException, IllegalArgumentException {
+    public void leafSetEntryNode(final Object value, final Map<QName, String> attributes) throws IOException {
         final LeafListSchemaNode schema = tracker.leafSetEntryNode();
         writeElement(schema.getQName(), schema, value, attributes);
     }
 
     @Override
-    public void startContainerNode(final NodeIdentifier name, final int childSizeHint, final Map<QName, String> attributes) throws IOException, IllegalArgumentException {
+    public void startContainerNode(final NodeIdentifier name, final int childSizeHint, final Map<QName, String> attributes) throws IOException {
         startContainerNode(name, childSizeHint);
         writeAttributes(attributes);
     }
 
     @Override
-    public void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint, final Map<QName, String> attributes) throws IOException, IllegalStateException {
+    public void startYangModeledAnyXmlNode(final NodeIdentifier name, final int childSizeHint, final Map<QName, String> attributes) throws IOException {
+        startYangModeledAnyXmlNode(name, childSizeHint);
+        writeAttributes(attributes);
+    }
+
+    @Override
+    public void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint, final Map<QName, String> attributes) throws IOException {
         startUnkeyedListItem(name, childSizeHint);
         writeAttributes(attributes);
     }
 
     @Override
-    public void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint, final Map<QName, String> attributes) throws IOException, IllegalArgumentException {
+    public void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint, final Map<QName, String> attributes) throws IOException {
         startMapEntryNode(identifier, childSizeHint);
         writeAttributes(attributes);
     }
@@ -191,6 +199,7 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode
         for (final Map.Entry<QName, String> qNameStringEntry : attributes.entrySet()) {
             try {
                 final String namespace = qNameStringEntry.getKey().getNamespace().toString();
+
                 if(Strings.isNullOrEmpty(namespace)) {
                     writer.writeAttribute(qNameStringEntry.getKey().getLocalName(), qNameStringEntry.getValue());
                 } else {
@@ -277,6 +286,12 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode
         }
     }
 
+    @Override
+    public void startYangModeledAnyXmlNode(final NodeIdentifier name, final int childSizeHint) throws IOException {
+        final SchemaNode schema = tracker.startYangModeledAnyXmlNode(name);
+        startElement(schema.getQName());
+    }
+
     public static String toString(final Element xml) {
         try {
             final Transformer transformer = TransformerFactory.newInstance().newTransformer();
@@ -502,7 +517,7 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode
         }
 
         @Override
-        public Object getProperty(final String name) throws IllegalArgumentException {
+        public Object getProperty(final String name) {
             return writer.getProperty(name);
         }
     }