From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 17 Jan 2023 13:22:16 +0000 (+0100)
Subject: Improve verify() calls
X-Git-Tag: v10.0.3~10
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F62%2F104062%2F1;p=yangtools.git

Improve verify() calls

Rather than using plain generic verifyNotNull(), provide some context
to improve diagnostics when verification actually fails.

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

diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java
index e47e315397..d60acdb92c 100644
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/AbstractResumedStatement.java
@@ -64,7 +64,7 @@ abstract class AbstractResumedStatement<A, D extends DeclaredStatement<A>, E ext
 
     @Override
     public Collection<? extends StatementContextBase<?, ?, ?>> mutableDeclaredSubstatements() {
-        return verifyNotNull(substatements);
+        return verifyNotNull(substatements, "Substatements no longer available in %s", this);
     }
 
     @Override
diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/OriginalStmtCtx.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/OriginalStmtCtx.java
index ec781391a3..1cb67054b8 100644
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/OriginalStmtCtx.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/OriginalStmtCtx.java
@@ -162,7 +162,7 @@ abstract class OriginalStmtCtx<A, D extends DeclaredStatement<A>, E extends Effe
     }
 
     final OriginalStmtCtx<?, ?, ?> getResumedSubstatement() {
-        final var local = verifyNotNull(effective);
+        final var local = verifyNotNull(effective, "Effective substatements no longer available in %s", this);
         verify(!local.isEmpty(), "Unexpected empty statements");
         final var ret = local.get(0);
         verify(ret instanceof OriginalStmtCtx, "Unexpected statement %s", ret);
diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java
index 7edbb5f723..9a08e2436c 100644
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/CustomCrossSourceStatementReactorBuilder.java
@@ -146,6 +146,6 @@ public class CustomCrossSourceStatementReactorBuilder implements Mutable {
     }
 
     private StatementSupportBundle.@NonNull Builder getBuilder(final ModelProcessingPhase phase) {
-        return verifyNotNull(reactorSupportBundles.get(phase));
+        return verifyNotNull(reactorSupportBundles.get(phase), "No builder for %s found", phase);
     }
 }