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 e47e3153979a467d6a273988df496008910c1224..d60acdb92cb9dac0c2c67ca8e9c4fbed24ae7add 100644 (file)
--- 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 ec781391a316a9826bd12407bdb7b4066fee0348..1cb67054b830e7fdb1a5ee8a63026e11089a6bb6 100644 (file)
--- 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 7edbb5f7234357f2f4ceeaaf19465f59e4699245..9a08e2436c0e27032d262bdce9c2add571fecb87 100644 (file)
--- 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);
     }
 }