From 6b51698a9fe5dd456792dbf246bc807a4127a292 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 30 Sep 2019 13:31:50 +0200 Subject: [PATCH] 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 --- .../codec/impl/BindingToNormalizedStreamWriter.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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 2d6ad13e68..7b9117fb8d 100644 --- 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 dom = serializeLeaf(name, value); - if (ext.startAnydataNode(dom.getKey(), value.getValue().getObjectModel())) { - delegate.scalarValue(dom.getValue()); - delegate.endNode(); - } + final Entry dom = serializeLeaf(name, value); + if (delegate.startAnydataNode(dom.getKey(), value.getValue().getObjectModel())) { + delegate.scalarValue(dom.getValue()); + delegate.endNode(); } } -- 2.36.6