From 60aaa85b10b02b29f357fb53fed5723a498e1cef Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 24 Nov 2020 13:19:56 +0100
Subject: [PATCH] Fixup collections return implementations

Adjust nullness annotations to fix Eclipse-reported errors.

Change-Id: I664c651e9bf10fd9d91bae00cc31edf86f9fda0c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 5d35db7723bb19c00955c580b21df9552de9fea0)
---
 .../YangModeledAnyxmlEffectiveStatementImpl.java |  2 +-
 .../rfc7950/stmt/AbstractEffectiveModule.java    | 16 ++++++++--------
 .../choice/ChoiceEffectiveStatementImpl.java     |  2 +-
 .../EmptyLeafListEffectiveStatement.java         |  3 +--
 .../module/ModuleEffectiveStatementImpl.java     |  2 +-
 .../SubmoduleEffectiveStatementImpl.java         |  2 +-
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java
index a2ddeba143..9bc5584edf 100644
--- a/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java
+++ b/yang/odlext-parser-support/src/main/java/org/opendaylight/yangtools/odlext/parser/YangModeledAnyxmlEffectiveStatementImpl.java
@@ -105,7 +105,7 @@ final class YangModeledAnyxmlEffectiveStatementImpl
     }
 
     @Override
-    public Collection<? extends MustDefinition> getMustConstraints() {
+    public Collection<? extends @NonNull MustDefinition> getMustConstraints() {
         return delegateSchemaNode().getMustConstraints();
     }
 
diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java
index b4f1db277d..aab5cb9ac3 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/AbstractEffectiveModule.java
@@ -149,42 +149,42 @@ public abstract class AbstractEffectiveModule<D extends DeclaredStatement<Unqual
     }
 
     @Override
-    public Collection<? extends ModuleImport> getImports() {
+    public Collection<? extends @NonNull ModuleImport> getImports() {
         return filterSubstatements(ModuleImport.class);
     }
 
     @Override
-    public Collection<? extends FeatureDefinition> getFeatures() {
+    public Collection<? extends @NonNull FeatureDefinition> getFeatures() {
         return filterSubstatements(FeatureDefinition.class);
     }
 
     @Override
-    public Collection<? extends NotificationDefinition> getNotifications() {
+    public Collection<? extends @NonNull NotificationDefinition> getNotifications() {
         return filterSubstatements(NotificationDefinition.class);
     }
 
     @Override
-    public Collection<? extends AugmentationSchemaNode> getAugmentations() {
+    public Collection<? extends @NonNull AugmentationSchemaNode> getAugmentations() {
         return filterSubstatements(AugmentationSchemaNode.class);
     }
 
     @Override
-    public Collection<? extends RpcDefinition> getRpcs() {
+    public Collection<? extends @NonNull RpcDefinition> getRpcs() {
         return filterSubstatements(RpcDefinition.class);
     }
 
     @Override
-    public Collection<? extends Deviation> getDeviations() {
+    public Collection<? extends @NonNull Deviation> getDeviations() {
         return filterSubstatements(Deviation.class);
     }
 
     @Override
-    public Collection<? extends ExtensionDefinition> getExtensionSchemaNodes() {
+    public Collection<? extends @NonNull ExtensionDefinition> getExtensionSchemaNodes() {
         return filterSubstatements(ExtensionDefinition.class);
     }
 
     @Override
-    public Collection<? extends IdentitySchemaNode> getIdentities() {
+    public Collection<? extends @NonNull IdentitySchemaNode> getIdentities() {
         return filterSubstatements(IdentitySchemaNode.class);
     }
 
diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java
index 2ab3b7c675..0e1cbd8248 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/choice/ChoiceEffectiveStatementImpl.java
@@ -77,7 +77,7 @@ final class ChoiceEffectiveStatementImpl extends WithSubstatements<QName, Choice
     }
 
     @Override
-    public Collection<? extends CaseSchemaNode> getCases() {
+    public Collection<? extends @NonNull CaseSchemaNode> getCases() {
         return filterEffectiveStatements(CaseSchemaNode.class);
     }
 
diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/EmptyLeafListEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/EmptyLeafListEffectiveStatement.java
index 7905da1793..2c6620282e 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/EmptyLeafListEffectiveStatement.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/leaf_list/EmptyLeafListEffectiveStatement.java
@@ -11,7 +11,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import java.util.Collection;
 import java.util.Optional;
-import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.ElementCountConstraint;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
@@ -30,7 +29,7 @@ final class EmptyLeafListEffectiveStatement extends AbstractLeafListEffectiveSta
     }
 
     @Override
-    public @NonNull Collection<? extends Object> getDefaults() {
+    public Collection<Object> getDefaults() {
         return ImmutableSet.of();
     }
 
diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java
index 32ef301814..e9f9a6df4d 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleEffectiveStatementImpl.java
@@ -109,7 +109,7 @@ final class ModuleEffectiveStatementImpl extends AbstractEffectiveModule<ModuleS
     }
 
     @Override
-    public Collection<? extends Submodule> getSubmodules() {
+    public Collection<? extends @NonNull Submodule> getSubmodules() {
         return submodules;
     }
 
diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleEffectiveStatementImpl.java
index d8d512bcd8..dfe3f8eb21 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/submodule/SubmoduleEffectiveStatementImpl.java
@@ -126,7 +126,7 @@ final class SubmoduleEffectiveStatementImpl
     }
 
     @Override
-    public Collection<? extends Submodule> getSubmodules() {
+    public Collection<? extends @NonNull Submodule> getSubmodules() {
         checkState(sealed, "Attempt to get base submodules from unsealed submodule effective statement %s",
             qnameModule);
         return submodules;
-- 
2.36.6