Ignore empty augmentations at runtime

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

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/InstanceIdentifierCodec.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/InstanceIdentifierCodec.java
index becd7c208a73f185a055fdec00f55a4aa64318fc..3a906784495cb6381b603707c8457e13f1b0a6d3 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/InstanceIdentifierCodec.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/InstanceIdentifierCodec.java
@@ -12,12 +12,18 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.collect.Iterables;
 import java.util.ArrayList;
 import java.util.List;
-import org.opendaylight.yangtools.concepts.Codec;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingDataObjectCodecTreeNode;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingInstanceIdentifierCodec;
+import org.opendaylight.yangtools.concepts.IllegalArgumentCodec;
+import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 
-final class InstanceIdentifierCodec implements Codec<YangInstanceIdentifier, InstanceIdentifier<?>> {
+final class InstanceIdentifierCodec implements BindingInstanceIdentifierCodec,
+        //FIXME: this is not really an IllegalArgumentCodec, as it can legally return null from deserialize()
+        IllegalArgumentCodec<YangInstanceIdentifier, InstanceIdentifier<?>> {
     private final BindingCodecContext context;
 
     InstanceIdentifierCodec(final BindingCodecContext context) {
@@ -25,16 +31,9 @@ final class InstanceIdentifierCodec implements Codec<YangInstanceIdentifier, Ins
     }
 
     @Override
-    public YangInstanceIdentifier serialize(final InstanceIdentifier<?> input) {
-        final List<PathArgument> domArgs = new ArrayList<>();
-        context.getCodecContextNode(input, domArgs);
-        return YangInstanceIdentifier.create(domArgs);
-    }
-
-    @Override
-    public InstanceIdentifier<?> deserialize(final YangInstanceIdentifier input) {
+    public <T extends DataObject> InstanceIdentifier<T> toBinding(final YangInstanceIdentifier domPath) {
         final List<InstanceIdentifier.PathArgument> builder = new ArrayList<>();
-        final NodeCodecContext<?> codec = context.getCodecContextNode(input, builder);
+        final BindingDataObjectCodecTreeNode<?> codec = context.getCodecContextNode(domPath, builder);
         if (codec == null) {
             return null;
         }
@@ -43,6 +42,26 @@ final class InstanceIdentifierCodec implements Codec<YangInstanceIdentifier, Ins
             // which is not binding representable.
             return null;
         }
-        return InstanceIdentifier.create(builder);
+
+        return InstanceIdentifier.unsafeOf(builder);
+    }
+
+    @Override
+    public @NonNull YangInstanceIdentifier fromBinding(@NonNull final InstanceIdentifier<?> bindingPath) {
+        final List<PathArgument> domArgs = new ArrayList<>();
+        context.getCodecContextNode(bindingPath, domArgs);
+        return YangInstanceIdentifier.create(domArgs);
+    }
+
+    @Override
+    @Deprecated
+    public YangInstanceIdentifier serialize(final InstanceIdentifier<?> input) {
+        return fromBinding(input);
+    }
+
+    @Override
+    @Deprecated
+    public InstanceIdentifier<?> deserialize(final YangInstanceIdentifier input) {
+        return toBinding(input);
     }
-}
\ No newline at end of file
+}