Fix ModifiedNode.identifier nullness

The identifier should always we present, enforce and annotate that.

Change-Id: I0bcebec56ab6fcee6b3c3b396dddbda92282729f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/ModifiedNode.java b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/ModifiedNode.java
index 5f10fca72757db98b750ba8f44fb9141ad0a8e27..0201cd21e2754ec79f5e23bdbb26da86e29f4ff0 100644 (file)
--- a/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/ModifiedNode.java
+++ b/data/yang-data-tree-ri/src/main/java/org/opendaylight/yangtools/yang/data/tree/impl/ModifiedNode.java
@@ -42,7 +42,7 @@ import org.opendaylight.yangtools.yang.data.tree.impl.node.Version;
 final class ModifiedNode extends NodeModification implements StoreTreeNode<ModifiedNode> {
     private final Map<PathArgument, ModifiedNode> children;
     private final Optional<? extends TreeNode> original;
-    private final PathArgument identifier;
+    private final @NonNull PathArgument identifier;
 
     private LogicalOperation operation = LogicalOperation.NONE;
     private Optional<TreeNode> snapshotCache;
@@ -59,7 +59,7 @@ final class ModifiedNode extends NodeModification implements StoreTreeNode<Modif
 
     private ModifiedNode(final PathArgument identifier, final Optional<? extends TreeNode> original,
             final ChildTrackingPolicy childPolicy) {
-        this.identifier = identifier;
+        this.identifier = requireNonNull(identifier);
         this.original = original;
         children = childPolicy.createMap();
     }