Fix nullness errors reported by Eclipse

[mdsal.git] / binding / yang-binding / src / main / java / org / opendaylight / yangtools / yang / binding / KeyedInstanceIdentifier.java

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/KeyedInstanceIdentifier.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/KeyedInstanceIdentifier.java
index 427f4e05938057d18076679d05178eda5a73a689..38b61c39accd9c4bd1348dc0fa46feab3d461432 100644 (file)
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/KeyedInstanceIdentifier.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/KeyedInstanceIdentifier.java
@@ -7,6 +7,9 @@
  */
 package org.opendaylight.yangtools.yang.binding;
 
+import java.io.ObjectStreamException;
+import org.eclipse.jdt.annotation.NonNull;
+
 /**
  * An {@link InstanceIdentifier}, which has a list key attached at its last path element.
  *
@@ -15,11 +18,11 @@ package org.opendaylight.yangtools.yang.binding;
  */
 public class KeyedInstanceIdentifier<T extends Identifiable<K> & DataObject, K extends Identifier<T>>
         extends InstanceIdentifier<T> {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2L;
     private final K key;
 
-    KeyedInstanceIdentifier(final Class<T> type, final Iterable<PathArgument> pathArguments, final boolean wildcarded,
-        final int hash, final K key) {
+    KeyedInstanceIdentifier(final Class<@NonNull T> type, final Iterable<PathArgument> pathArguments,
+            final boolean wildcarded, final int hash, final K key) {
         super(type, pathArguments, wildcarded, hash);
         this.key = key;
     }
@@ -51,4 +54,8 @@ public class KeyedInstanceIdentifier<T extends Identifiable<K> & DataObject, K e
          */
         return key == null != (kii.key == null);
     }
+
+    private Object writeReplace() throws ObjectStreamException {
+        return new KeyedInstanceIdentifierV2<>(this);
+    }
 }