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=5367d6d6738e1c6af0af1b10b1aa00a4d6d9fe6b;hb=984dfcd854a006724cbf0b20efc8bac6094bad48;hp=44151a7b81560239d149cba1806f5122f86a2100;hpb=5b67ca39a136aa27e34adf1d8933a717c1dd6a75;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 44151a7b81..5367d6d673 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
@@ -10,58 +10,54 @@ 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 com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
 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.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
-import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 
-abstract class KeyedListNodeCodecContext<D extends DataObject & Identifiable<?>> extends ListNodeCodecContext<D> {
-    private static final class Ordered<D extends DataObject & Identifiable<?>> extends KeyedListNodeCodecContext<D> {
-        Ordered(final DataContainerCodecPrototype<ListSchemaNode> prototype, final Method keyMethod,
+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);
         }
     }
 
-    private static final class Unordered<D extends DataObject & Identifiable<?>> extends KeyedListNodeCodecContext<D> {
-        Unordered(final DataContainerCodecPrototype<ListSchemaNode> prototype, final Method keyMethod,
+    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
-        Object fromMap(final MapNode map, final int size) {
-            // FIXME: MDSAL-539: Make this a lazily-populated map
-            final Builder<Object, D> builder = ImmutableMap.builderWithExpectedSize(size);
-            for (MapEntryNode node : map.getValue()) {
-                final D entry = fromMapEntry(node);
-                builder.put(entry.key(), entry);
-            }
-            return builder.build();
+        Map<I, D> fromMap(final MapNode map, final int size) {
+            return LazyBindingMap.create(this, map, size);
         }
     }
 
     private final IdentifiableItemCodec codec;
 
-    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 {
@@ -70,10 +66,11 @@ abstract class KeyedListNodeCodecContext<D extends DataObject & Identifiable<?>>
             throw new IllegalStateException("Required method not available", e);
         }
 
-        final ListSchemaNode schema = prototype.getSchema();
-        final IdentifiableItemCodec codec = prototype.getFactory().getPathArgumentCodec(bindingClass, schema);
-        return schema.isUserOrdered() ? new Ordered<>(prototype, keyMethod, codec)
-                : new Unordered<>(prototype, keyMethod, codec);
+        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
@@ -89,7 +86,7 @@ abstract class KeyedListNodeCodecContext<D extends DataObject & Identifiable<?>>
 
         super.addYangPathArgument(arg, builder);
         if (arg instanceof IdentifiableItem) {
-            builder.add(codec.serialize((IdentifiableItem<?, ?>) arg));
+            builder.add(codec.bindingToDom((IdentifiableItem<?, ?>) arg));
         } else {
             // Adding wildcarded
             super.addYangPathArgument(arg, builder);
@@ -98,15 +95,13 @@ abstract class KeyedListNodeCodecContext<D extends DataObject & Identifiable<?>>
 
     @Override
     protected InstanceIdentifier.PathArgument getBindingPathArgument(final YangInstanceIdentifier.PathArgument domArg) {
-        if (domArg instanceof NodeIdentifierWithPredicates) {
-            return codec.deserialize((NodeIdentifierWithPredicates) domArg);
-        }
-        return super.getBindingPathArgument(domArg);
+        return domArg instanceof NodeIdentifierWithPredicates
+            ? codec.domToBinding((NodeIdentifierWithPredicates) domArg) : super.getBindingPathArgument(domArg);
     }
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     NodeIdentifierWithPredicates serialize(final Identifier<?> key) {
-        return codec.serialize(IdentifiableItem.of((Class)getBindingClass(), (Identifier)key));
+        return codec.bindingToDom(IdentifiableItem.of((Class)getBindingClass(), (Identifier)key));
     }
 
     @NonNull Identifier<?> deserialize(final NodeIdentifierWithPredicates arg) {
@@ -115,17 +110,13 @@ abstract class KeyedListNodeCodecContext<D extends DataObject & Identifiable<?>>
 
     @Override
     public YangInstanceIdentifier.PathArgument serializePathArgument(final InstanceIdentifier.PathArgument arg) {
-        if (arg instanceof IdentifiableItem) {
-            return codec.serialize((IdentifiableItem<?, ?>) arg);
-        }
-        return super.serializePathArgument(arg);
+        return arg instanceof IdentifiableItem
+            ? codec.bindingToDom((IdentifiableItem<?, ?>) arg) : super.serializePathArgument(arg);
     }
 
     @Override
     public InstanceIdentifier.PathArgument deserializePathArgument(final YangInstanceIdentifier.PathArgument arg) {
-        if (arg instanceof NodeIdentifierWithPredicates) {
-            return codec.deserialize((NodeIdentifierWithPredicates) arg);
-        }
-        return super.deserializePathArgument(arg);
+        return arg instanceof NodeIdentifierWithPredicates
+            ? codec.domToBinding((NodeIdentifierWithPredicates) arg) : super.deserializePathArgument(arg);
     }
 }