X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-codec%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fcodec%2Fimpl%2FKeyedListNodeCodecContext.java;h=aa6dd00d8f11512f465bfef15af0512cee374459;hb=11408d627adca7eb71ac956c3ad01f75b6b91596;hp=8a85f3467a6599ca87fbfa190dcaf77a504153d6;hpb=7cbe9276481690b54693ced7a059db9482806447;p=mdsal.git

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/KeyedListNodeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/KeyedListNodeCodecContext.java
index 8a85f3467a..aa6dd00d8f 100644
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/KeyedListNodeCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/KeyedListNodeCodecContext.java
@@ -7,33 +7,70 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
+import static java.util.Objects.requireNonNull;
+import static org.opendaylight.mdsal.binding.spec.naming.BindingMapping.IDENTIFIABLE_KEY_NAME;
+
 import java.lang.reflect.Method;
 import java.util.List;
-import org.opendaylight.yangtools.concepts.Codec;
+import java.util.Map;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.runtime.api.ListRuntimeType;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.Identifiable;
 import org.opendaylight.yangtools.yang.binding.Identifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.IdentifiableItem;
+import org.opendaylight.yangtools.yang.common.Ordering;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
-import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+
+abstract class KeyedListNodeCodecContext<I extends Identifier<D>, D extends DataObject & Identifiable<I>>
+        extends ListNodeCodecContext<D> {
+    private static final class Ordered<I extends Identifier<D>, D extends DataObject & Identifiable<I>>
+            extends KeyedListNodeCodecContext<I, D> {
+        Ordered(final DataContainerCodecPrototype<ListRuntimeType> prototype, final Method keyMethod,
+                final IdentifiableItemCodec codec) {
+            super(prototype, keyMethod, codec);
+        }
+    }
+
+    static final class Unordered<I extends Identifier<D>, D extends DataObject & Identifiable<I>>
+            extends KeyedListNodeCodecContext<I, D> {
+        Unordered(final DataContainerCodecPrototype<ListRuntimeType> prototype, final Method keyMethod,
+                final IdentifiableItemCodec codec) {
+            super(prototype, keyMethod, codec);
+        }
 
-final class KeyedListNodeCodecContext<D extends DataObject & Identifiable<?>> extends ListNodeCodecContext<D> {
-    private final Codec<NodeIdentifierWithPredicates, IdentifiableItem<?, ?>> codec;
-    private final Method keyGetter;
+        @Override
+        Map<I, D> fromMap(final MapNode map, final int size) {
+            return LazyBindingMap.create(this, map, size);
+        }
+    }
 
-    KeyedListNodeCodecContext(final DataContainerCodecPrototype<ListSchemaNode> prototype) {
-        super(prototype);
+    private final IdentifiableItemCodec codec;
+
+    KeyedListNodeCodecContext(final DataContainerCodecPrototype<ListRuntimeType> prototype,
+            final Method keyMethod, final IdentifiableItemCodec codec) {
+        super(prototype, keyMethod);
+        this.codec = requireNonNull(codec);
+    }
 
-        this.codec = factory().getPathArgumentCodec(getBindingClass(), getSchema());
+    @SuppressWarnings("rawtypes")
+    static KeyedListNodeCodecContext create(final DataContainerCodecPrototype<ListRuntimeType> prototype) {
+        final Class<?> bindingClass = prototype.getBindingClass();
+        final Method keyMethod;
         try {
-            this.keyGetter = getBindingClass().getMethod("getKey");
+            keyMethod = bindingClass.getMethod(IDENTIFIABLE_KEY_NAME);
         } catch (NoSuchMethodException e) {
             throw new IllegalStateException("Required method not available", e);
         }
+
+        final ListRuntimeType type = prototype.getType();
+        final IdentifiableItemCodec codec = prototype.getFactory().getPathArgumentCodec(bindingClass, type);
+
+        return type.statement().ordering() == Ordering.SYSTEM ? new Unordered<>(prototype, keyMethod, codec)
+            : new Ordered<>(prototype, keyMethod, codec);
     }
 
     @Override
@@ -56,16 +93,6 @@ final class KeyedListNodeCodecContext<D extends DataObject & Identifiable<?>> ex
         }
     }
 
-    @Override
-    @SuppressWarnings("rawtypes")
-    Object getBindingChildValue(final Method method, final NormalizedNodeContainer dom) {
-        if (dom instanceof MapEntryNode && keyGetter.equals(method)) {
-            NodeIdentifierWithPredicates identifier = ((MapEntryNode) dom).getIdentifier();
-            return codec.deserialize(identifier).getKey();
-        }
-        return super.getBindingChildValue(method, dom);
-    }
-
     @Override
     protected InstanceIdentifier.PathArgument getBindingPathArgument(final YangInstanceIdentifier.PathArgument domArg) {
         if (domArg instanceof NodeIdentifierWithPredicates) {
@@ -79,6 +106,10 @@ final class KeyedListNodeCodecContext<D extends DataObject & Identifiable<?>> ex
         return codec.serialize(IdentifiableItem.of((Class)getBindingClass(), (Identifier)key));
     }
 
+    @NonNull Identifier<?> deserialize(final NodeIdentifierWithPredicates arg) {
+        return codec.deserializeIdentifier(arg);
+    }
+
     @Override
     public YangInstanceIdentifier.PathArgument serializePathArgument(final InstanceIdentifier.PathArgument arg) {
         if (arg instanceof IdentifiableItem) {