Integrate AnydataExtension

[yangtools.git] / yang / yang-data-api / src / main / java / org / opendaylight / yangtools / yang / data / api / schema / stream / NormalizedNodeWriter.java

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java
index d031902522c352e7fd03e40ccbc616aacb927b1d..96500be75412f9574e282dd50cd2389b017654c7 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/NormalizedNodeWriter.java
@@ -161,20 +161,15 @@ public class NormalizedNodeWriter implements Closeable, Flushable {
 
             LOG.debug("Ignoring unhandled anyxml node {}", anyxmlNode);
         } else if (node instanceof AnydataNode) {
-            final AnydataExtension ext = writer.getExtensions().getInstance(AnydataExtension.class);
-            if (ext != null) {
-                final AnydataNode<?> anydata = (AnydataNode<?>) node;
-                final Class<?> model = anydata.getValueObjectModel();
-                if (ext.startAnydataNode(anydata.getIdentifier(), model)) {
-                    writer.scalarValue(anydata.getValue());
-                    writer.endNode();
-                    return true;
-                }
-
-                LOG.debug("Writer {} does not support anydata in form of {}", writer, model);
-            } else {
-                LOG.debug("Writer {} does not support anydata", writer);
+            final AnydataNode<?> anydata = (AnydataNode<?>) node;
+            final Class<?> model = anydata.getValueObjectModel();
+            if (writer.startAnydataNode(anydata.getIdentifier(), model)) {
+                writer.scalarValue(anydata.getValue());
+                writer.endNode();
+                return true;
             }
+
+            LOG.debug("Writer {} does not support anydata in form of {}", writer, model);
         }
 
         return false;