From a1c443957c539dcf75a44aa76dfee3a860e4d085 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 3 Sep 2014 16:00:13 +0200 Subject: [PATCH] Do not require namespace repairing Turns the requirement off, as we are generating namespaces as needed. Change-Id: I7d91324a00c0281c3e6ffbf3a5c3befc432db8e0 Signed-off-by: Robert Varga --- .../yangtools/yang/data/impl/codec/xml/RandomPrefix.java | 8 +++++++- .../codec/xml/XMLStreamNormalizedNodeStreamWriter.java | 3 --- .../yang/data/impl/codec/xml/XmlStreamUtils.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefix.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefix.java index 518e796808..125ac23eb8 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefix.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/RandomPrefix.java @@ -15,6 +15,7 @@ import com.google.common.collect.HashBiMap; import java.net.URI; import java.util.Map; +import javax.xml.XMLConstants; import javax.xml.namespace.NamespaceContext; class RandomPrefix { @@ -57,7 +58,12 @@ class RandomPrefix { } private boolean alreadyUsedPrefix(final String prefix) { - return context != null && context.getNamespaceURI(prefix) != null; + if (context == null) { + return false; + } + + final String str = context.getNamespaceURI(prefix); + return !XMLConstants.NULL_NS_URI.equals(str); } @VisibleForTesting 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 c244867077..bec315491f 100644 --- 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 @@ -11,7 +11,6 @@ import com.google.common.base.Preconditions; import java.io.IOException; -import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; @@ -68,8 +67,6 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode * @return A new {@link NormalizedNodeStreamWriter} */ public static NormalizedNodeStreamWriter create(final XMLStreamWriter writer, final SchemaContext context, final SchemaPath path) { - final Boolean repairing = (Boolean) writer.getProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES); - Preconditions.checkArgument(repairing == true, "XML Stream Writer has to be repairing namespaces"); return new XMLStreamNormalizedNodeStreamWriter(writer, context, path); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtils.java index 14b5c8593f..22fc3b9f76 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlStreamUtils.java @@ -269,7 +269,7 @@ public class XmlStreamUtils { 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)); } } -- 2.36.6