Add XMLNamespace

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

diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java
index 5f7f5bb8db19d9511ea7fc4dde64875bea93f133..32ad7d523337c07ef0935075d7696a8bd10130a1 100644 (file)
--- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java
+++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java
@@ -7,42 +7,50 @@
  */
 package org.opendaylight.yangtools.yang.data.codec.xml;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
-import java.net.URI;
+import static com.google.common.base.Verify.verifyNotNull;
+import static java.util.Objects.requireNonNull;
+
 import java.util.Map.Entry;
 import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition;
 import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
 
-final class SchemaAwareXMLStreamWriterUtils extends XMLStreamWriterUtils {
-    private final SchemaContext schemaContext;
+final class SchemaAwareXMLStreamWriterUtils extends XMLStreamWriterUtils implements EffectiveModelContextProvider {
+    private final @NonNull EffectiveModelContext schemaContext;
 
-    SchemaAwareXMLStreamWriterUtils(final SchemaContext schemaContext) {
-        this.schemaContext = Preconditions.checkNotNull(schemaContext);
+    SchemaAwareXMLStreamWriterUtils(final EffectiveModelContext schemaContext) {
+        this.schemaContext = requireNonNull(schemaContext);
     }
 
     @Override
     TypeDefinition<?> getBaseTypeForLeafRef(final SchemaNode schemaNode, final LeafrefTypeDefinition type) {
         final TypeDefinition<?> ret = SchemaContextUtil.getBaseTypeForLeafRef(type, schemaContext, schemaNode);
-        return Verify.verifyNotNull(ret, "Unable to find base type for leafref node '%s'.", schemaNode.getPath());
+        return verifyNotNull(ret, "Unable to find base type for leafref node '%s'.", schemaNode);
     }
 
     @Override
-    void writeInstanceIdentifier(final XMLStreamWriter writer, final YangInstanceIdentifier value)
+    String encodeInstanceIdentifier(final ValueWriter writer, final YangInstanceIdentifier value)
             throws XMLStreamException {
-        RandomPrefixInstanceIdentifierSerializer iiCodec = new RandomPrefixInstanceIdentifierSerializer(schemaContext);
+        RandomPrefixInstanceIdentifierSerializer iiCodec = new RandomPrefixInstanceIdentifierSerializer(schemaContext,
+            writer.getNamespaceContext());
         String serializedValue = iiCodec.serialize(value);
 
-        for (Entry<URI, String> e : iiCodec.getPrefixes()) {
+        for (Entry<XMLNamespace, String> e : iiCodec.getPrefixes()) {
             writer.writeNamespace(e.getValue(), e.getKey().toString());
         }
 
-        writer.writeCharacters(serializedValue);
+        return serializedValue;
+    }
+
+    @Override
+    public EffectiveModelContext getEffectiveModelContext() {
+        return schemaContext;
     }
 }