Add XMLNamespace

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

diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStringInstanceIdentifierCodec.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStringInstanceIdentifierCodec.java
index 292078f4588cf1117b650e7fdb54afa69ce72de9..47bd2ba769923804cc413301693cb1be974a9840 100644 (file)
--- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStringInstanceIdentifierCodec.java
+++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlStringInstanceIdentifierCodec.java
@@ -5,53 +5,55 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.data.codec.xml;
 
-import com.google.common.base.Preconditions;
-import java.net.URI;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
 import java.util.ArrayDeque;
 import java.util.Deque;
-import javax.annotation.Nonnull;
+import java.util.Iterator;
 import javax.xml.namespace.NamespaceContext;
 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.data.util.AbstractModuleStringInstanceIdentifierCodec;
 import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
-final class XmlStringInstanceIdentifierCodec  extends AbstractModuleStringInstanceIdentifierCodec
+final class XmlStringInstanceIdentifierCodec extends AbstractModuleStringInstanceIdentifierCodec
         implements XmlCodec<YangInstanceIdentifier> {
 
     private static final ThreadLocal<Deque<NamespaceContext>> TL_CONTEXT = new ThreadLocal<>();
 
-    private final DataSchemaContextTree dataContextTree;
-    private final XmlCodecFactory codecFactory;
-    private final SchemaContext context;
+    private final @NonNull DataSchemaContextTree dataContextTree;
+    private final @NonNull XmlCodecFactory codecFactory;
+    private final @NonNull EffectiveModelContext context;
 
-    XmlStringInstanceIdentifierCodec(final SchemaContext context, final XmlCodecFactory xmlCodecFactory) {
-        this.context = Preconditions.checkNotNull(context);
+    XmlStringInstanceIdentifierCodec(final EffectiveModelContext context, final XmlCodecFactory xmlCodecFactory) {
+        this.context = requireNonNull(context);
         this.dataContextTree = DataSchemaContextTree.from(context);
-        this.codecFactory = Preconditions.checkNotNull(xmlCodecFactory);
+        this.codecFactory = requireNonNull(xmlCodecFactory);
     }
 
     @Override
-    protected Module moduleForPrefix(@Nonnull final String prefix) {
+    protected Module moduleForPrefix(final String prefix) {
         final String prefixedNS = getNamespaceContext().getNamespaceURI(prefix);
-        return context.findModuleByNamespaceAndRevision(URI.create(prefixedNS), null);
+        final Iterator<? extends Module> modules = context.findModules(XMLNamespace.of(prefixedNS)).iterator();
+        return modules.hasNext() ? modules.next() : null;
     }
 
     @Override
-    protected String prefixForNamespace(@Nonnull final URI namespace) {
-        final Module module = context.findModuleByNamespaceAndRevision(namespace, null);
-        return module == null ? null : module.getName();
+    protected String prefixForNamespace(final XMLNamespace namespace) {
+        final Iterator<? extends Module> modules = context.findModules(namespace).iterator();
+        return modules.hasNext() ? modules.next().getName() : null;
     }
 
-    @Nonnull
     @Override
     protected DataSchemaContextTree getDataContextTree() {
         return dataContextTree;
@@ -59,31 +61,31 @@ final class XmlStringInstanceIdentifierCodec  extends AbstractModuleStringInstan
 
     @Override
     protected Object deserializeKeyValue(final DataSchemaNode schemaNode, final String value) {
-        Preconditions.checkNotNull(schemaNode, "schemaNode cannot be null");
-        Preconditions.checkArgument(schemaNode instanceof LeafSchemaNode, "schemaNode must be of type LeafSchemaNode");
+        requireNonNull(schemaNode, "schemaNode cannot be null");
+        checkArgument(schemaNode instanceof LeafSchemaNode, "schemaNode must be of type LeafSchemaNode");
         final XmlCodec<?> objectXmlCodec = codecFactory.codecFor((LeafSchemaNode) schemaNode);
-        return objectXmlCodec.deserializeFromString(getNamespaceContext(), value);
+        return objectXmlCodec.parseValue(getNamespaceContext(), value);
     }
 
     @Override
-    public Class<YangInstanceIdentifier> getDataClass() {
+    public Class<YangInstanceIdentifier> getDataType() {
         return YangInstanceIdentifier.class;
     }
 
     @Override
-    public YangInstanceIdentifier deserializeFromString(final NamespaceContext namespaceContext, final String value) {
-        pushNamespaceContext(namespaceContext);
+    public YangInstanceIdentifier parseValue(final NamespaceContext ctx, final String str) {
+        pushNamespaceContext(ctx);
         try {
-            return deserialize(value);
+            return deserialize(str);
         } finally {
             popNamespaceContext();
         }
     }
 
     @Override
-    public void serializeToWriter(final XMLStreamWriter writer, final YangInstanceIdentifier value)
+    public void writeValue(final XMLStreamWriter ctx, final YangInstanceIdentifier value)
             throws XMLStreamException {
-        writer.writeCharacters(serialize(value));
+        ctx.writeCharacters(serialize(value));
     }
 
     private static NamespaceContext getNamespaceContext() {