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 <robert.varga@pantheon.tech>
(cherry picked from commit 0c28880fd3df1ba253161b6b75f63f2d7a6e7c02)

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 c03ed44d6b3e08cf103a4b025bb365e0e4fb3d72..ed797d7215973c7a09a1ca8ce9d1182b919eabea 100644 (file)
--- 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 cdc6f0a81335fb234e69b6f094b9d0c007730619..8152ca01f76ee902c72fa49c3304896c068f820c 100644 (file)
--- 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 6ac565531e3d3d8a8ce19237d2da61147f893bee..60e5cd9870c50afc88da2edbca9180658600555e 100644 (file)
--- 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 "));
         }
     }