X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-codec%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fcodec%2Fimpl%2FCodecDataObject.java;h=65e40086155a3d804c3262dbc1d05ef2105a6643;hb=9f23891d96e635e1cd30c699f9b72b9336fc9d06;hp=f61dc2c50a76fa58e4668e8437257827e7497b5d;hpb=82b2bbabd5fb42e96e4a7eb81486a14378c010da;p=mdsal.git

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObject.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObject.java
index f61dc2c50a..65e4008615 100644
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObject.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObject.java
@@ -10,6 +10,7 @@ package org.opendaylight.mdsal.binding.dom.codec.impl;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.VerifyException;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import org.eclipse.jdt.annotation.NonNull;
@@ -46,6 +47,7 @@ public abstract class CodecDataObject<T extends DataObject> implements DataObjec
     // Accessed via a VarHandle
     @SuppressWarnings("unused")
     // FIXME: consider using a primitive int-based cache (with 0 being uninit)
+    @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "https://github.com/spotbugs/spotbugs/issues/2749")
     private volatile Integer cachedHashcode;
 
     protected CodecDataObject(final AbstractDataObjectCodecContext<T, ?> context, final DataContainerNode data) {
@@ -90,8 +92,8 @@ public abstract class CodecDataObject<T extends DataObject> implements DataObjec
 
     private @NonNull Object emptyObject(final @NonNull Class<? extends DataObject> bindingClass) {
         final var childContext = context.getStreamChild(bindingClass);
-        if (childContext instanceof NonPresenceContainerNodeCodecContext<?> nonPresence) {
-            return nonPresence.emptyObject();
+        if (childContext instanceof StructuralContainerCodecContext<?> structural) {
+            return structural.emptyObject();
         }
         throw new VerifyException("Unexpected context " + childContext);
     }
@@ -129,7 +131,7 @@ public abstract class CodecDataObject<T extends DataObject> implements DataObjec
         if (!(data instanceof MapEntryNode mapEntry)) {
             throw new VerifyException("Unsupported value " + data);
         }
-        if (!(context instanceof KeyedListNodeCodecContext<?, ?> listContext)) {
+        if (!(context instanceof MapCodecContext<?, ?> listContext)) {
             throw new VerifyException("Unexpected context " + context);
         }