Adjust for AnydataExtension being integrated

This updates serialization code to match changes made to
NormalizedNodeStreamWriter -- i.e. AnydataExtension being an
integral part of it.

Change-Id: Id09cec7ba7f7d4359379e9bd74baae4d008b1e63
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingToNormalizedStreamWriter.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingToNormalizedStreamWriter.java
index 2d6ad13e68287f5eb587d362ad181230c4080cf5..7b9117fb8d0e96baaad4954953f32286244b9f1f 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingToNormalizedStreamWriter.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingToNormalizedStreamWriter.java
@@ -29,7 +29,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.Augmentat
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
-import org.opendaylight.yangtools.yang.data.api.schema.stream.AnydataExtension;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 
@@ -130,13 +129,10 @@ final class BindingToNormalizedStreamWriter implements AnydataBindingStreamWrite
 
     @Override
     public void anydataNode(final String name, final OpaqueObject<?> value) throws IOException {
-        final AnydataExtension ext = delegate.getExtensions().getInstance(AnydataExtension.class);
-        if (ext != null) {
-            final Entry<NodeIdentifier, Object> dom = serializeLeaf(name, value);
-            if (ext.startAnydataNode(dom.getKey(), value.getValue().getObjectModel())) {
-                delegate.scalarValue(dom.getValue());
-                delegate.endNode();
-            }
+        final Entry<NodeIdentifier, Object> dom = serializeLeaf(name, value);
+        if (delegate.startAnydataNode(dom.getKey(), value.getValue().getObjectModel())) {
+            delegate.scalarValue(dom.getValue());
+            delegate.endNode();
         }
     }