Bump upstreams

[netconf.git] / restconf / restconf-nb / src / main / java / org / opendaylight / restconf / server / spi / ApiPathInstanceIdentifierCodec.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/ApiPathInstanceIdentifierCodec.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/ApiPathInstanceIdentifierCodec.java
index 9bde6cb53b09c771d45950cb13a63f3fedec8707..3bb26a499fe5513bc95df95842a92d4d13c71baa 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/ApiPathInstanceIdentifierCodec.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/ApiPathInstanceIdentifierCodec.java
@@ -11,12 +11,15 @@ import static java.util.Objects.requireNonNull;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.restconf.server.api.DatabindContext;
+import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
-import org.opendaylight.yangtools.yang.data.util.AbstractModuleStringInstanceIdentifierCodec;
+import org.opendaylight.yangtools.yang.data.util.AbstractStringInstanceIdentifierCodec;
 import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree;
-import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.util.LeafrefResolver;
 
-final class ApiPathInstanceIdentifierCodec extends AbstractModuleStringInstanceIdentifierCodec {
+final class ApiPathInstanceIdentifierCodec extends AbstractStringInstanceIdentifierCodec {
     private final @NonNull DatabindContext databind;
 
     ApiPathInstanceIdentifierCodec(final DatabindContext databind) {
@@ -29,12 +32,22 @@ final class ApiPathInstanceIdentifierCodec extends AbstractModuleStringInstanceI
     }
 
     @Override
-    protected Module moduleForPrefix(final String prefix) {
-        return databind.modelContext().findModules(prefix).stream().findFirst().orElse(null);
+    protected QNameModule moduleForPrefix(final String prefix) {
+        return databind.modelContext().findModuleStatements(prefix).stream().findFirst()
+            .map(ModuleEffectiveStatement::localQNameModule)
+            .orElse(null);
     }
 
     @Override
     protected String prefixForNamespace(final XMLNamespace namespace) {
-        return databind.modelContext().findModule(namespace).stream().findFirst().map(Module::getName).orElse(null);
+        return databind.modelContext().findModuleStatements(namespace).stream().findFirst()
+            .map(module -> module.argument().getLocalName())
+            .orElse(null);
+    }
+
+    @Override
+    protected Object deserializeKeyValue(final DataSchemaNode schemaNode, final LeafrefResolver resolver,
+            final String value) {
+        throw new UnsupportedOperationException("FIXME: implement this method");
     }
 }