From f41046523fa774099734c64aa3a4e4c79b9a5d33 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 20 Nov 2017 14:13:31 +0100 Subject: [PATCH] YANGTOOLS-813: add parent schemapath to error report It is not immediately clear in what context the search is being made -- make sure we report parent path, too. Change-Id: I86a15b409c6241d93f24ee75cc68ff78fc067ebc Signed-off-by: Robert Varga (cherry picked from commit 0c28880fd3df1ba253161b6b75f63f2d7a6e7c02) --- .../yangtools/yang/data/codec/xml/XmlParserStream.java | 4 ++-- .../yangtools/yang/data/codec/xml/StrictParsingModeTest.java | 2 +- .../yang/data/codec/xml/XmlToNormalizedNodesTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java index c03ed44d6b..ed797d7215 100644 --- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java +++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlParserStream.java @@ -364,8 +364,8 @@ public final class XmlParserStream implements Closeable, Flushable { if (childDataSchemaNodes.isEmpty()) { Preconditions.checkState(!strictParsing, - "Schema for node with name %s and namespace %s doesn't exist.", xmlElementName, - xmlElementNamespace); + "Schema for node with name %s and namespace %s doesn't exist at %s", xmlElementName, + xmlElementNamespace, parentSchema.getPath()); skipUnknownNode(in); continue; } diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/StrictParsingModeTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/StrictParsingModeTest.java index cdc6f0a813..8152ca01f7 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/StrictParsingModeTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/StrictParsingModeTest.java @@ -79,7 +79,7 @@ public class StrictParsingModeTest { fail("IllegalStateException should have been thrown because of an unknown child node."); } catch (IllegalStateException ex) { assertTrue(ex.getMessage().contains("Schema for node with name unknown-container-a and namespace " - + "foo doesn't exist.")); + + "foo doesn't exist at ")); } } } diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java index 6ac565531e..60e5cd9870 100644 --- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java +++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/XmlToNormalizedNodesTest.java @@ -308,7 +308,7 @@ public class XmlToNormalizedNodesTest { fail("IllegalStateException should have been thrown because of an unknown child node."); } catch (IllegalStateException ex) { assertTrue(ex.getMessage().contains("Schema for node with name my-container-1 and namespace baz-namespace" - + " doesn't exist.")); + + " doesn't exist at ")); } } -- 2.36.6