Reparent ChoiceCodecContext

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

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NonCachingCodec.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NonCachingCodec.java
index 39671919c996f9d1a9317d32c674a2332e9c4768..187ca066a33d0d220dca4a90bf743a5720fb6648 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NonCachingCodec.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NonCachingCodec.java
@@ -7,26 +7,27 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeCachingCodec;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeCodec;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-class NonCachingCodec<D extends DataObject> implements BindingNormalizedNodeCachingCodec<D> {
-
+final class NonCachingCodec<D extends DataObject> implements BindingNormalizedNodeCachingCodec<D> {
     private final BindingNormalizedNodeCodec<D> delegate;
 
-    protected NonCachingCodec(final BindingNormalizedNodeCodec<D> delegate) {
-        this.delegate = delegate;
+    NonCachingCodec(final BindingNormalizedNodeCodec<D> delegate) {
+        this.delegate = requireNonNull(delegate);
     }
 
     @Override
-    public D deserialize(final NormalizedNode<?, ?> data) {
+    public D deserialize(final NormalizedNode data) {
         return delegate.deserialize(data);
     }
 
     @Override
-    public NormalizedNode<?, ?> serialize(final D data) {
+    public NormalizedNode serialize(final D data) {
         return delegate.serialize(data);
     }
 
@@ -34,5 +35,4 @@ class NonCachingCodec<D extends DataObject> implements BindingNormalizedNodeCach
     public void close() {
         // NOOP
     }
-
 }