Rework AugmentRuntimeType and Choice/Case linkage

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

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeCodec.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeCodec.java
index c8504d778fc5c2c4b16f65822fe61cfc3262eeeb..6f2e3a60ba8bebf8a685c2b70e40bdb3ede6f535 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeCodec.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeCodec.java
@@ -11,33 +11,35 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableSet;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeCachingCodec;
+import org.opendaylight.yangtools.yang.binding.BindingObject;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 class CachingNormalizedNodeCodec<D extends DataObject> extends AbstractBindingNormalizedNodeCacheHolder implements
         BindingNormalizedNodeCachingCodec<D> {
-
     private final DataContainerCodecContext<D, ?> context;
 
     CachingNormalizedNodeCodec(final DataContainerCodecContext<D, ?> subtreeRoot,
-            final ImmutableSet<Class<? extends DataObject>> cacheSpec) {
+            final ImmutableSet<Class<? extends BindingObject>> cacheSpec) {
         super(cacheSpec);
         this.context = requireNonNull(subtreeRoot);
     }
 
     @Override
-    public D deserialize(final NormalizedNode<?, ?> data) {
+    public D deserialize(final NormalizedNode data) {
         return context.deserialize(data);
     }
 
     @Override
-    public NormalizedNode<?, ?> serialize(final D data) {
-        return CachingNormalizedNodeSerializer.serialize(this, context, data);
+    public NormalizedNode serialize(final D data) {
+        // Serialize data using stream writer with child cache enable or using the cache if it is available
+        final AbstractBindingNormalizedNodeCache<D, ?> cache = getCachingSerializer(context);
+        return cache == null ? CachingNormalizedNodeSerializer.serializeUsingStreamWriter(this, context, data)
+                : cache.get(data);
     }
 
     @Override
     public void close() {
         // NOOP as of now.
     }
-
 }