From b10df5e822e5c65cd9d9e106967a45d1f19b1929 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 11 Apr 2020 04:46:48 +0200 Subject: [PATCH] Improve verification message Since we have the class identity available, let's use it to diagnoze failures to supply a proper resource name. Change-Id: I9b159e9ca8c16565b8e63b82637696ea90a42bc6 Signed-off-by: Robert Varga --- .../yangtools/yang/binding/ResourceYangModuleInfo.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/ResourceYangModuleInfo.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/ResourceYangModuleInfo.java index 7a03a65d43..c351ee340b 100644 --- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/ResourceYangModuleInfo.java +++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/ResourceYangModuleInfo.java @@ -27,9 +27,10 @@ public abstract class ResourceYangModuleInfo implements YangModuleInfo { @Override public final InputStream openYangTextStream() throws IOException { final Class subclass = getClass(); - final InputStream ret = subclass.getResourceAsStream(verifyNotNull(resourceName())); + final String name = verifyNotNull(resourceName(), "%s provided a null resource name", subclass); + final InputStream ret = subclass.getResourceAsStream(name); if (ret == null) { - String message = "Failed to open resource " + resourceName() + " in context of " + subclass; + String message = "Failed to open resource " + name + " in context of " + subclass; final ClassLoader loader = subclass.getClassLoader(); if (!ResourceYangModuleInfo.class.getClassLoader().equals(loader)) { message = message + " (loaded in " + loader + ")"; -- 2.36.6