From 42366fcbc0b0246d95c6ba73f3fa77f16395629e Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 22 Mar 2022 09:57:05 +0100
Subject: [PATCH] Ditch use of RpcDefintion.getOutput().getPath()

This does not solve much, but reduces clutter a bit.

JIRA: NETCONF-818
Change-Id: I2028703449459f1fac7ee8774dd26125420b7308
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java    | 3 ++-
 .../netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java
index a797215ac3..50ca47bbd4 100644
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java
@@ -128,7 +128,8 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter<Normalize
              *  RpcDefinition is not supported as initial codec in JSONStreamWriter,
              *  so we need to emit initial output declaratation..
              */
-            path = ((RpcDefinition) context.getSchemaNode()).getOutput().getPath();
+            final var rpc = (RpcDefinition) context.getSchemaNode();
+            path = SchemaPath.create(true, rpc.getQName(), rpc.getOutput().getQName());
             nnWriter = createNormalizedNodeWriter(context, path, jsonWriter, depth);
             jsonWriter.name("output");
             jsonWriter.beginObject();
diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java
index 39eecad79c..ea559b9b5e 100644
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java
@@ -127,8 +127,9 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter<Normalized
                 writeElements(xmlWriter, nnWriter, (ContainerNode) data);
             }
         }  else if (pathContext.getSchemaNode() instanceof RpcDefinition) {
+            final var rpc = (RpcDefinition) pathContext.getSchemaNode();
             nnWriter = createNormalizedNodeWriter(xmlWriter, schemaCtx,
-                    ((RpcDefinition) pathContext.getSchemaNode()).getOutput().getPath(), depth);
+                    SchemaPath.create(true, rpc.getQName(), rpc.getOutput().getQName()), depth);
             writeElements(xmlWriter, nnWriter, (ContainerNode) data);
         } else {
             nnWriter = createNormalizedNodeWriter(xmlWriter, schemaCtx, schemaPath.getParent(), depth);
-- 
2.36.6