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.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.Node;
import org.opendaylight.yangtools.yang.data.api.SimpleNode;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodec;
import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils;
import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
final String ns = qname.getNamespace() != null ? qname.getNamespace().toString() : "";
if (isEmptyElement(data)) {
- writer.writeEmptyElement(pfx, qname.getLocalName(), ns);
+ if (hasAttributes(data)) {
+ writer.writeStartElement(pfx, qname.getLocalName(), ns);
+ final RandomPrefix randomPrefix = new RandomPrefix();
+ writeAttributes(writer, (AttributesContainer) data, randomPrefix);
+ writer.writeEndElement();
+ } else {
+ writer.writeEmptyElement(pfx, qname.getLocalName(), ns);
+ }
return;
}
writer.writeStartElement(pfx, qname.getLocalName(), ns);
- if (data instanceof AttributesContainer && ((AttributesContainer) data).getAttributes() != null) {
+ writeValue(writer, data, schema);
+ writer.writeEndElement();
+ }
+
+ /**
+ * Write a value into a XML stream writer. This method assumes the start and end of element is
+ * emitted by the caller.
+ *
+ * @param writer XML Stream writer
+ * @param data data node
+ * @param schema Schema node
+ * @throws XMLStreamException if an encoding problem occurs
+ */
+ public void writeValue(final XMLStreamWriter writer, final @Nonnull Node<?> data, final SchemaNode schema) throws XMLStreamException {
+ if (hasAttributes(data)) {
RandomPrefix randomPrefix = new RandomPrefix();
- for (Entry<QName, String> attribute : ((AttributesContainer) data).getAttributes().entrySet()) {
- writeAttribute(writer, attribute, randomPrefix);
- }
+ writeAttributes(writer, (AttributesContainer) data, randomPrefix);
}
if (data instanceof SimpleNode<?>) {
writeElement(writer, child, childSchema);
}
}
+ }
- writer.writeEndElement();
+ private static void writeAttributes(final XMLStreamWriter writer, final AttributesContainer data, final RandomPrefix randomPrefix) throws XMLStreamException {
+ for (Entry<QName, String> attribute : data.getAttributes().entrySet()) {
+ writeAttribute(writer, attribute, randomPrefix);
+ }
+ }
+
+ private static boolean hasAttributes(final Node<?> data) {
+ if (data instanceof AttributesContainer) {
+ final Map<QName, String> c = ((AttributesContainer) data).getAttributes();
+ return c != null && !c.isEmpty();
+ } else {
+ return false;
+ }
}
@VisibleForTesting
static void writeAttribute(final XMLStreamWriter writer, final Entry<QName, String> attribute, final RandomPrefix randomPrefix)
throws XMLStreamException {
final QName key = attribute.getKey();
- final String prefix = randomPrefix.encodePrefix(key);
+ final String prefix = randomPrefix.encodePrefix(key.getNamespace());
writer.writeAttribute("xmlns:" + prefix, key.getNamespace().toString());
writer.writeAttribute(prefix, key.getNamespace().toString(), key.getLocalName(), attribute.getValue());
}
* emitted by the caller.
*
* @param writer XML Stream writer
- * @param data data node
- * @param schema Schema node
+ * @param type data type
+ * @param value data value
* @throws XMLStreamException if an encoding problem occurs
*/
public void writeValue(final @Nonnull XMLStreamWriter writer, final @Nonnull TypeDefinition<?> type, final Object value) throws XMLStreamException {
if (value instanceof YangInstanceIdentifier) {
write(writer, (YangInstanceIdentifier)value);
} else {
- LOG.debug("Value of {}:{} is not an InstanceIdentifier but {}", type.getQName().getNamespace(), type.getQName().getLocalName(), value.getClass());
+ LOG.warn("Value of {}:{} is not an InstanceIdentifier but {}", type.getQName().getNamespace(), type.getQName().getLocalName(), value.getClass());
writer.writeCharacters(String.valueOf(value));
}
}