From baa5e7266943b54af843086503035e2b0ba79ab8 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 17 May 2022 23:38:07 +0200
Subject: [PATCH] Enforce non-null compositions

Expressions may not contain null values, make sure we enforce that.

Change-Id: Icd08a1c9bc2d931837f7b31362d453d794a2a0bd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../yangtools/yang/model/api/stmt/IfFeatureExpr.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureExpr.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureExpr.java
index 0850b58e77..b1944f70fe 100644
--- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureExpr.java
+++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/IfFeatureExpr.java
@@ -36,7 +36,7 @@ import org.opendaylight.yangtools.yang.common.QName;
 @Beta
 public abstract sealed class IfFeatureExpr implements Immutable, Predicate<Set<QName>> {
     private abstract static sealed class Single extends IfFeatureExpr {
-        final QName qname;
+        final @NonNull QName qname;
 
         Single(final QName qname) {
             this.qname = requireNonNull(qname);
@@ -447,7 +447,8 @@ public abstract sealed class IfFeatureExpr implements Immutable, Predicate<Set<Q
             } else if (expr instanceof Absent) {
                 negative = true;
             } else {
-                return mixed.apply(exprs.toArray(new IfFeatureExpr[0]));
+                requireNonNull(expr);
+                negative = positive = true;
             }
         }
 
-- 
2.36.6