Fix return types

The prototype requires nonnull results, make sure implementations
promise the same thing.

JIRA: YANGTOOLS-1150
Change-Id: I1a98ddde1443786fe74b0d8928fb752e0ef98fc5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java
index 025198a35e4c869c467a8ebebeb4039bcf7843ea..57bab3d3483b2cff0ae2cd6f53dd14f90d3c7322 100644 (file)
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java
@@ -203,12 +203,12 @@ abstract class AbstractResumedStatement<A, D extends DeclaredStatement<A>, E ext
     }
 
     @Override
-    final Stream<? extends StmtContext<?, ?, ?>> streamDeclared() {
+    final Stream<? extends @NonNull StmtContext<?, ?, ?>> streamDeclared() {
         return declaredSubstatements().stream().filter(StmtContext::isSupportedToBuildEffective);
     }
 
     @Override
-    final Stream<? extends StmtContext<?, ?, ?>> streamEffective() {
+    final Stream<? extends @NonNull StmtContext<?, ?, ?>> streamEffective() {
         return effective.stream().filter(StmtContext::isSupportedToBuildEffective);
     }
 

diff --git a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java
index b05c0f636d50a146a3d8a41c0050c58329581fdf..95e68c91727d027236dac2283f7086ec58bb8c08 100644 (file)
--- a/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java
+++ b/yang/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java
@@ -451,12 +451,12 @@ final class InferredStatementContext<A, D extends DeclaredStatement<A>, E extend
     }
 
     @Override
-    Stream<? extends StmtContext<?, ?, ?>> streamDeclared() {
+    Stream<? extends @NonNull StmtContext<?, ?, ?>> streamDeclared() {
         return Stream.empty();
     }
 
     @Override
-    Stream<? extends StmtContext<?, ?, ?>> streamEffective() {
+    Stream<? extends @NonNull StmtContext<?, ?, ?>> streamEffective() {
         accessSubstatements();
         return ensureEffectiveSubstatements().stream().filter(StmtContext::isSupportedToBuildEffective);
     }