Remove BindingDataObjectCodecTreeNode.writeAsNormalizedNode()

This is a leak of implementation internals, not used anywhere but inside
the implementation.

JIRA: MDSAL-820
Change-Id: I3869dd490eb94f218ea86ff7b164ac05f2f5a9e5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-codec-api/src/main/java/org/opendaylight/mdsal/binding/dom/codec/api/BindingDataObjectCodecTreeNode.java b/binding/mdsal-binding-dom-codec-api/src/main/java/org/opendaylight/mdsal/binding/dom/codec/api/BindingDataObjectCodecTreeNode.java
index 8d8a32f5efa2358a3643f6e6896b89588866824d..6804739b0a1ff53c521ab529ba62e973a7b73246 100644 (file)
--- a/binding/mdsal-binding-dom-codec-api/src/main/java/org/opendaylight/mdsal/binding/dom/codec/api/BindingDataObjectCodecTreeNode.java
+++ b/binding/mdsal-binding-dom-codec-api/src/main/java/org/opendaylight/mdsal/binding/dom/codec/api/BindingDataObjectCodecTreeNode.java
@@ -18,7 +18,6 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
 
 @Beta
 public interface BindingDataObjectCodecTreeNode<T extends DataObject>
@@ -126,9 +125,6 @@ public interface BindingDataObjectCodecTreeNode<T extends DataObject>
     @NonNull BindingNormalizedNodeCachingCodec<T> createCachingCodec(
             @NonNull ImmutableCollection<Class<? extends BindingObject>> cacheSpecifier);
 
-    @Beta
-    void writeAsNormalizedNode(T data, NormalizedNodeStreamWriter writer);
-
     /**
      * Enumeration of possible addressability attribute of all children.
      */

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java
index 413209aa0062ae79e54477824e10d6134d2a812f..cf851327d7347102750c6916179a22e5d5e3ef62 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java
@@ -267,17 +267,12 @@ abstract class DataContainerCodecContext<D extends DataObject, T extends Runtime
         final NormalizedNodeResult result = new NormalizedNodeResult();
         // We create DOM stream writer which produces normalized nodes
         final NormalizedNodeStreamWriter domWriter = ImmutableNormalizedNodeStreamWriter.from(result);
-        writeAsNormalizedNode(data, domWriter);
-        return result.getResult();
-    }
-
-    @Override
-    public void writeAsNormalizedNode(final D data, final NormalizedNodeStreamWriter writer) {
         try {
-            eventStreamSerializer().serialize(data, new BindingToNormalizedStreamWriter(this, writer));
+            eventStreamSerializer().serialize(data, new BindingToNormalizedStreamWriter(this, domWriter));
         } catch (final IOException e) {
             throw new IllegalStateException("Failed to serialize Binding DTO",e);
         }
+        return result.getResult();
     }
 
     static final <T extends NormalizedNode> @NonNull T checkDataArgument(final @NonNull Class<T> expectedType,