Refactor PathArgument to DataObjectStep

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

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecContext.java
index 9b497fce4b34e00e4bceb72453e56e4e7c1b7504..39e8e419bf5497778c2235bd52c09fd1c19906fb 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MapCodecContext.java
@@ -15,15 +15,15 @@ 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.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.IdentifiableItem;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.Item;
+import org.opendaylight.yangtools.yang.binding.DataObjectStep;
 import org.opendaylight.yangtools.yang.binding.Key;
 import org.opendaylight.yangtools.yang.binding.KeyAware;
+import org.opendaylight.yangtools.yang.binding.KeyStep;
+import org.opendaylight.yangtools.yang.binding.KeylessStep;
 import org.opendaylight.yangtools.yang.binding.contract.Naming;
 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.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 
 abstract sealed class MapCodecContext<I extends Key<D>, D extends DataObject & KeyAware<I>>
@@ -56,9 +56,9 @@ abstract sealed class MapCodecContext<I extends Key<D>, D extends DataObject & K
         this.codec = requireNonNull(codec);
     }
 
-    static @NonNull MapCodecContext<?, ?>  of(final Class<? extends DataObject> cls, final ListRuntimeType type,
+    static @NonNull MapCodecContext<?, ?> of(final Class<? extends DataObject> cls, final ListRuntimeType type,
             final CodecContextFactory factory) {
-        return of(new MapCodecPrototype(Item.of(cls), type, factory));
+        return of(new MapCodecPrototype(new KeylessStep(cls), type, factory));
     }
 
     static @NonNull MapCodecContext<?, ?> of(final MapCodecPrototype prototype) {
@@ -78,8 +78,7 @@ abstract sealed class MapCodecContext<I extends Key<D>, D extends DataObject & K
     }
 
     @Override
-    void addYangPathArgument(final List<YangInstanceIdentifier.PathArgument> builder,
-            final InstanceIdentifier.PathArgument arg) {
+    void addYangPathArgument(final List<PathArgument> builder, final DataObjectStep<?> step) {
         /*
          * DOM Instance Identifier for list is always represent by two entries one for map and one for children. This
          * is also true for wildcarded instance identifiers
@@ -87,8 +86,8 @@ abstract sealed class MapCodecContext<I extends Key<D>, D extends DataObject & K
         final var yangArg = getDomPathArgument();
         builder.add(yangArg);
 
-        if (arg instanceof IdentifiableItem<?, ?> identifiable) {
-            builder.add(codec.bindingToDom(identifiable));
+        if (step instanceof KeyStep<?, ?> keyStep) {
+            builder.add(codec.bindingToDom(keyStep));
         } else {
             // Adding wildcarded
             builder.add(yangArg);
@@ -96,15 +95,14 @@ abstract sealed class MapCodecContext<I extends Key<D>, D extends DataObject & K
     }
 
     @Override
-    protected final InstanceIdentifier.PathArgument getBindingPathArgument(
-            final YangInstanceIdentifier.PathArgument domArg) {
+    protected final DataObjectStep<?> getBindingPathArgument(final PathArgument domArg) {
         return domArg instanceof NodeIdentifierWithPredicates nip ? codec.domToBinding(nip)
             : super.getBindingPathArgument(domArg);
     }
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     final NodeIdentifierWithPredicates serialize(final Key<?> key) {
-        return codec.bindingToDom(IdentifiableItem.of((Class)getBindingClass(), (Key)key));
+        return codec.bindingToDom(new KeyStep(getBindingClass(), key));
     }
 
     final @NonNull Key<?> deserialize(final @NonNull NodeIdentifierWithPredicates arg) {
@@ -112,14 +110,12 @@ abstract sealed class MapCodecContext<I extends Key<D>, D extends DataObject & K
     }
 
     @Override
-    public final YangInstanceIdentifier.PathArgument serializePathArgument(final InstanceIdentifier.PathArgument arg) {
-        return arg instanceof IdentifiableItem<?, ?> identifiable ? codec.bindingToDom(identifiable)
-            : super.serializePathArgument(arg);
+    public final PathArgument serializePathArgument(final DataObjectStep<?> step) {
+        return step instanceof KeyStep<?, ?> keyStep ? codec.bindingToDom(keyStep) : super.serializePathArgument(step);
     }
 
     @Override
-    public final InstanceIdentifier.PathArgument deserializePathArgument(
-        final YangInstanceIdentifier.PathArgument arg) {
+    public final DataObjectStep<?> deserializePathArgument(final PathArgument arg) {
         return arg instanceof NodeIdentifierWithPredicates nip ? codec.domToBinding(nip)
             : super.deserializePathArgument(arg);
     }