From bb92c633b41a636162f4f14cf818f4f66d9eaab4 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Sun, 3 Apr 2016 20:03:15 -0400 Subject: [PATCH] Improve error message when child schema not found In AbstractNodeContainerModificationStrategy, added the parent id to the error messages to provide more context for troubleshooting. Change-Id: I87fe94b8eab35f50de022db3406b14e667ad691e Signed-off-by: Tom Pantelis --- .../tree/AbstractNodeContainerModificationStrategy.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java index c6190f1cbc..4a1e598e42 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java @@ -53,12 +53,14 @@ abstract class AbstractNodeContainerModificationStrategy extends SchemaAwareAppl childOp.get().verifyStructure(castedChild, verifyChildren); } else { throw new SchemaValidationFailedException(String.format( - "Child %s is not valid child according to schema.", castedChild.getIdentifier())); + "Node %s is not a valid child of %s according to the schema.", + castedChild.getIdentifier(), container.getIdentifier())); } } } } + @Override protected void recursivelyVerifyStructure(NormalizedNode value) { final NormalizedNodeContainer container = (NormalizedNodeContainer) value; for (final Object child : container.getValue()) { @@ -69,7 +71,8 @@ abstract class AbstractNodeContainerModificationStrategy extends SchemaAwareAppl childOp.get().recursivelyVerifyStructure(castedChild); } else { throw new SchemaValidationFailedException( - String.format("Child %s is not valid child according to schema.", castedChild.getIdentifier())); + String.format("Node %s is not a valid child of %s according to the schema.", + castedChild.getIdentifier(), container.getIdentifier())); } } } -- 2.36.6