Disconnect IdentifiableItemCodec from IllegalArgumentCodec

[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 189d443abcc9e26e1722f266db214af503f0e0a8..5367d6d6738e1c6af0af1b10b1aa00a4d6d9fe6b 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
@@ -24,7 +24,6 @@ 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.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> {
@@ -70,9 +69,8 @@ abstract class KeyedListNodeCodecContext<I extends Identifier<D>, D extends Data
         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);
+        return type.statement().ordering() == Ordering.SYSTEM ? new Unordered<>(prototype, keyMethod, codec)
+            : new Ordered<>(prototype, keyMethod, codec);
     }
 
     @Override
@@ -88,7 +86,7 @@ abstract class KeyedListNodeCodecContext<I extends Identifier<D>, D extends Data
 
         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);
@@ -97,15 +95,13 @@ abstract class KeyedListNodeCodecContext<I extends Identifier<D>, D extends Data
 
     @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) {
@@ -114,17 +110,13 @@ abstract class KeyedListNodeCodecContext<I extends Identifier<D>, D extends Data
 
     @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);
     }
 }