Remove SchemaNode#getPath usage from XmlPatchBodyReader

Removed deprecated SchemaNode#getPath from XmlPatchBodyReader class
by using YangInstanceIdentifier and QNames that it contain to create
SchemaInferenceStack based on it.

JIRA: NETCONF-818
Change-Id: I550db7c94e0434e87769b8972f70eb88f73a0c27
Signed-off-by: OleksandrZharov <Oleksandr.Zharov@pantheon.tech>
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java
index 75b8bac83a30dfcc9ae8c00a8428001455e414a5..b5cce862289a63f4a24642f137ed0b0e23542aa4 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java
@@ -50,6 +50,7 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
+import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack.Inference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -105,9 +106,11 @@ public class XmlPatchBodyReader extends AbstractPatchBodyReader {
             // target can be also empty (only slash)
             YangInstanceIdentifier targetII;
             final SchemaNode targetNode;
+            final Inference inference;
             if (target.equals("/")) {
                 targetII = pathContext.getInstanceIdentifier();
                 targetNode = pathContext.getSchemaContext();
+                inference = Inference.ofDataTreePath(pathContext.getSchemaContext(), schemaNode.getQName());
             } else {
                 // interpret as simple context
                 targetII = ParserIdentifier.parserPatchTarget(pathContext, target);
@@ -116,10 +119,15 @@ public class XmlPatchBodyReader extends AbstractPatchBodyReader {
                 schemaNode = verifyNotNull(DataSchemaContextTree.from(pathContext.getSchemaContext())
                     .findChild(targetII).orElseThrow().getDataSchemaNode());
 
-                final EffectiveStatement<?, ?> parentStmt = SchemaInferenceStack.ofInstantiatedPath(
-                    pathContext.getSchemaContext(), schemaNode.getPath().getParent()).currentStatement();
+                final SchemaInferenceStack stack = SchemaInferenceStack.of(pathContext.getSchemaContext());
+                targetII.getPathArguments().stream()
+                        .filter(arg -> !(arg instanceof YangInstanceIdentifier.NodeIdentifierWithPredicates))
+                        .filter(arg -> !(arg instanceof YangInstanceIdentifier.AugmentationIdentifier))
+                        .forEach(p -> stack.enterSchemaTree(p.getNodeType()));
+                final EffectiveStatement<?, ?> parentStmt = stack.exit();
                 verify(parentStmt instanceof SchemaNode, "Unexpected parent %s", parentStmt);
                 targetNode = (SchemaNode) parentStmt;
+                inference = stack.toInference();
             }
 
             if (targetNode == null) {
@@ -133,9 +141,8 @@ public class XmlPatchBodyReader extends AbstractPatchBodyReader {
                 if (schemaNode instanceof  ContainerSchemaNode || schemaNode instanceof ListSchemaNode) {
                     final NormalizedNodeResult resultHolder = new NormalizedNodeResult();
                     final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder);
-                    final XmlParserStream xmlParser = XmlParserStream.create(writer,
-                        SchemaInferenceStack.ofInstantiatedPath(pathContext.getSchemaContext(), schemaNode.getPath())
-                            .toInference());
+
+                    final XmlParserStream xmlParser = XmlParserStream.create(writer, inference);
                     xmlParser.traverse(new DOMSource(firstValueElement));
                     parsed = resultHolder.getResult();
                 } else {