Bump upstreams

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

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CommonDataObjectCodecPrototype.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CommonDataObjectCodecPrototype.java
index 67de4fb829d7f3dff6680244c12e8954897735ee..24340e46527227816b59f5efb9a5d575a4d349f4 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CommonDataObjectCodecPrototype.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CommonDataObjectCodecPrototype.java
@@ -9,15 +9,15 @@ package org.opendaylight.mdsal.binding.dom.codec.impl;
 
 import static java.util.Objects.requireNonNull;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.binding.runtime.api.RuntimeTypeContainer;
+import org.opendaylight.mdsal.binding.runtime.api.CompositeRuntimeType;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.Item;
-import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 
-abstract sealed class CommonDataObjectCodecPrototype<T extends RuntimeTypeContainer> implements CodecContextSupplier
+abstract sealed class CommonDataObjectCodecPrototype<T extends CompositeRuntimeType> implements CodecContextSupplier
         permits AugmentationCodecPrototype, DataObjectCodecPrototype {
     private static final VarHandle INSTANCE;
 
@@ -31,21 +31,16 @@ abstract sealed class CommonDataObjectCodecPrototype<T extends RuntimeTypeContai
     }
 
     private final @NonNull T type;
-    private final @NonNull QNameModule namespace;
     private final @NonNull CodecContextFactory factory;
     private final @NonNull Item<?> bindingArg;
 
-    // multiple paths represent augmentation wrapper
-    // FIXME: this means it is either this or 'childArgs'
-
     // Accessed via INSTANCE
     @SuppressWarnings("unused")
+    @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "https://github.com/spotbugs/spotbugs/issues/2749")
     private volatile CommonDataObjectCodecContext<?, T> instance;
 
-    CommonDataObjectCodecPrototype(final Item<?> bindingArg, final QNameModule namespace, final T type,
-            final CodecContextFactory factory) {
+    CommonDataObjectCodecPrototype(final Item<?> bindingArg, final T type, final CodecContextFactory factory) {
         this.bindingArg = requireNonNull(bindingArg);
-        this.namespace = requireNonNull(namespace);
         this.type = requireNonNull(type);
         this.factory = requireNonNull(factory);
     }
@@ -54,10 +49,6 @@ abstract sealed class CommonDataObjectCodecPrototype<T extends RuntimeTypeContai
         return type;
     }
 
-    final @NonNull QNameModule getNamespace() {
-        return namespace;
-    }
-
     final @NonNull CodecContextFactory getFactory() {
         return factory;
     }