From 7b90edc623bb972e58d38643bfedb21e53bc7bdb Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 6 Dec 2020 17:16:39 +0100
Subject: [PATCH] Fix implementation nullness guarantees

We are promising @NonNull in the contract, make sure implementations
do the same.

Change-Id: Ib895ffedc48c221ab4a98a4a318101bc3df46bc4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../yangtools/yang/data/util/ContainerSchemaNodes.java      | 3 ++-
 .../yangtools/yang/data/util/OperationAsContainer.java      | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java
index 337928f724..8010b84fbb 100644
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerSchemaNodes.java
@@ -16,6 +16,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import java.util.Collection;
 import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ActionDefinition;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
@@ -104,7 +105,7 @@ public final class ContainerSchemaNodes {
         }
 
         @Override
-        public Collection<? extends MustDefinition> getMustConstraints() {
+        public Collection<? extends @NonNull MustDefinition> getMustConstraints() {
             return ImmutableList.of();
         }
 
diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/OperationAsContainer.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/OperationAsContainer.java
index 0aa9b414d8..33b182c34e 100644
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/OperationAsContainer.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/OperationAsContainer.java
@@ -62,12 +62,12 @@ public class OperationAsContainer extends ForwardingObject implements ContainerL
     }
 
     @Override
-    public final Collection<? extends TypeDefinition<?>> getTypeDefinitions() {
+    public final Collection<? extends @NonNull TypeDefinition<?>> getTypeDefinitions() {
         return delegate.getTypeDefinitions();
     }
 
     @Override
-    public final Collection<? extends GroupingDefinition> getGroupings() {
+    public final Collection<? extends @NonNull GroupingDefinition> getGroupings() {
         return delegate.getGroupings();
     }
 
@@ -177,7 +177,7 @@ public class OperationAsContainer extends ForwardingObject implements ContainerL
     }
 
     @Override
-    public final Collection<? extends MustDefinition> getMustConstraints() {
+    public final Collection<? extends @NonNull MustDefinition> getMustConstraints() {
         return ImmutableSet.of();
     }
 
-- 
2.36.6