From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 22 Sep 2023 23:56:17 +0000 (+0200)
Subject: Improve context reporting
X-Git-Tag: v11.0.3~25
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ac5a7ba138a2a091f395a2df7b9316c4ebf86e03;p=yangtools.git

Improve context reporting

If we fail at first step, we end up emitting an empty string, which
makes the output not nice. Quote the emitted string.

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

diff --git a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringInstanceIdentifierCodec.java b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringInstanceIdentifierCodec.java
index b404a2d728..d5a0672f6e 100644
--- a/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringInstanceIdentifierCodec.java
+++ b/data/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AbstractStringInstanceIdentifierCodec.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.yang.data.util;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
@@ -50,8 +49,10 @@ public abstract class AbstractStringInstanceIdentifierCodec extends AbstractName
         QNameModule lastModule = null;
         for (var arg : data.getPathArguments()) {
             current = current instanceof Composite composite ? composite.childByArg(arg) : null;
-            checkArgument(current != null, "Invalid input %s: schema for argument %s (after %s) not found", data, arg,
-                    sb);
+            if (current == null) {
+                throw new IllegalArgumentException(
+                    "Invalid input %s: schema for argument %s (after \"%s\") not found".formatted(data, arg, sb));
+            }
 
             if (current instanceof PathMixin) {
                 /*