Retain protype in DataContainerCodecContext

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

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AbstractBindingNormalizedNodeCacheHolder.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AbstractBindingNormalizedNodeCacheHolder.java
index 7cfe964d3ae02a4b1924ea098345af6bc49f5e5f..e50b64402e3168b99fa9f8c750a8279c112543dd 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AbstractBindingNormalizedNodeCacheHolder.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AbstractBindingNormalizedNodeCacheHolder.java
@@ -27,7 +27,7 @@ abstract class AbstractBindingNormalizedNodeCacheHolder {
             @Override
             public AbstractBindingNormalizedNodeCache load(final CodecContext key) {
                 // FIXME: Use a switch expression once we have https://openjdk.org/jeps/441
-                if (key instanceof DataContainerCodecContext<?, ?> dataContainer) {
+                if (key instanceof DataContainerCodecContext<?, ?, ?> dataContainer) {
                     return new DataObjectNormalizedNodeCache(AbstractBindingNormalizedNodeCacheHolder.this,
                         dataContainer);
                 }
@@ -38,19 +38,19 @@ abstract class AbstractBindingNormalizedNodeCacheHolder {
             }
         });
 
-    private final ImmutableSet<Class<? extends BindingObject>> cacheSpec;
+    private final ImmutableSet<Class<?>> cacheSpec;
 
-    AbstractBindingNormalizedNodeCacheHolder(final ImmutableSet<Class<? extends BindingObject>> cacheSpec) {
+    AbstractBindingNormalizedNodeCacheHolder(final ImmutableSet<Class<?>> cacheSpec) {
         this.cacheSpec = requireNonNull(cacheSpec);
     }
 
     @SuppressWarnings("unchecked")
-    <T extends BindingObject, C extends CodecContext & BindingObjectCodecTreeNode<?>>
+    <T extends BindingObject, C extends CodecContext & BindingObjectCodecTreeNode>
             AbstractBindingNormalizedNodeCache<T, C> getCachingSerializer(final C childCtx) {
         return isCached(childCtx.getBindingClass()) ? caches.getUnchecked(childCtx) : null;
     }
 
-    final boolean isCached(final Class<? extends BindingObject> type) {
+    final boolean isCached(final Class<?> type) {
         return cacheSpec.contains(type);
     }
 }