Rework BindingRuntimeTypes

[mdsal.git] / binding / mdsal-binding-dom-codec / src / main / java / org / opendaylight / mdsal / binding / dom / codec / impl / KeyedListNodeCodecContext.java

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 62dd9b74c196a3387d42e3e1d4a8404b1b54537b..189d443abcc9e26e1722f266db214af503f0e0a8 100644 (file)
--- 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
@@ -12,27 +12,53 @@ import static org.opendaylight.mdsal.binding.spec.naming.BindingMapping.IDENTIFI
 
 import java.lang.reflect.Method;
 import java.util.List;
+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.model.api.ListSchemaNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.opendaylight.yangtools.yang.model.api.stmt.OrderedByEffectiveStatement;
+
+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);
+        }
+
+        @Override
+        Map<I, D> fromMap(final MapNode map, final int size) {
+            return LazyBindingMap.create(this, map, size);
+        }
+    }
 
-final class KeyedListNodeCodecContext<D extends DataObject & Identifiable<?>> extends ListNodeCodecContext<D> {
     private final IdentifiableItemCodec codec;
 
-    private KeyedListNodeCodecContext(final DataContainerCodecPrototype<ListSchemaNode> prototype,
+    KeyedListNodeCodecContext(final DataContainerCodecPrototype<ListRuntimeType> prototype,
             final Method keyMethod, final IdentifiableItemCodec codec) {
         super(prototype, keyMethod);
         this.codec = requireNonNull(codec);
     }
 
     @SuppressWarnings("rawtypes")
-    static KeyedListNodeCodecContext create(final DataContainerCodecPrototype<ListSchemaNode> prototype) {
+    static KeyedListNodeCodecContext create(final DataContainerCodecPrototype<ListRuntimeType> prototype) {
         final Class<?> bindingClass = prototype.getBindingClass();
         final Method keyMethod;
         try {
@@ -41,9 +67,12 @@ final class KeyedListNodeCodecContext<D extends DataObject & Identifiable<?>> ex
             throw new IllegalStateException("Required method not available", e);
         }
 
-        final IdentifiableItemCodec codec = prototype.getFactory().getPathArgumentCodec(bindingClass,
-            prototype.getSchema());
-        return new KeyedListNodeCodecContext<>(prototype, keyMethod, codec);
+        final ListRuntimeType type = prototype.getType();
+        final IdentifiableItemCodec codec = prototype.getFactory().getPathArgumentCodec(bindingClass, type);
+
+        return type.statement().findFirstEffectiveSubstatementArgument(OrderedByEffectiveStatement.class)
+            .orElse(Ordering.SYSTEM) == Ordering.SYSTEM ? new Unordered<>(prototype, keyMethod, codec)
+                : new Ordered<>(prototype, keyMethod, codec);
     }
 
     @Override