Modernize SchemaAwareXMLStreamWriterUtils a bit

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

diff --git a/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java b/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java
index d619ae6d62fbc60bcc359950e572d5b8a9511db4..a89ea7d011942c3699420219daceb3dd31b54aab 100644 (file)
--- a/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java
+++ b/codec/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/SchemaAwareXMLStreamWriterUtils.java
@@ -9,37 +9,30 @@ package org.opendaylight.yangtools.yang.data.codec.xml;
 
 import static java.util.Objects.requireNonNull;
 
-import java.util.Map.Entry;
 import javax.xml.stream.XMLStreamException;
 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.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider;
 
-final class SchemaAwareXMLStreamWriterUtils extends XMLStreamWriterUtils implements EffectiveModelContextProvider {
-    private final @NonNull EffectiveModelContext schemaContext;
+final class SchemaAwareXMLStreamWriterUtils extends XMLStreamWriterUtils {
+    private final @NonNull EffectiveModelContext modelContext;
 
-    SchemaAwareXMLStreamWriterUtils(final EffectiveModelContext schemaContext) {
-        this.schemaContext = requireNonNull(schemaContext);
+    SchemaAwareXMLStreamWriterUtils(final EffectiveModelContext modelContext) {
+        this.modelContext = requireNonNull(modelContext);
+    }
+
+    @NonNull EffectiveModelContext modelContext() {
+        return modelContext;
     }
 
     @Override
     String encodeInstanceIdentifier(final ValueWriter writer, final YangInstanceIdentifier value)
             throws XMLStreamException {
-        RandomPrefixInstanceIdentifierSerializer iiCodec = new RandomPrefixInstanceIdentifierSerializer(schemaContext,
-            writer.getNamespaceContext());
-        String serializedValue = iiCodec.serialize(value);
-
-        for (Entry<XMLNamespace, String> e : iiCodec.getPrefixes()) {
+        final var iiCodec = new RandomPrefixInstanceIdentifierSerializer(modelContext, writer.getNamespaceContext());
+        final var serializedValue = iiCodec.serialize(value);
+        for (var e : iiCodec.getPrefixes()) {
             writer.writeNamespace(e.getValue(), e.getKey().toString());
         }
-
         return serializedValue;
     }
-
-    @Override
-    public EffectiveModelContext getEffectiveModelContext() {
-        return schemaContext;
-    }
 }