From 30384dfa718b6f3a9afdb9b4f4a98701342ad747 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 23 Aug 2019 14:32:11 +0200 Subject: [PATCH] Cleanup toRpcResult() We have a NETCONF_RPC_REPLY_NODEID readily available, there is no point in recreating its equivalent. Also use proper nested builder pattern to get rid of some useless temporary variables. Change-Id: Iffa0cc8f9e3bb46cbb06b18afec23a60cb9282e1 Signed-off-by: Robert Varga --- .../mapping/NetconfMessageTransformer.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java index b3c0c803d5..60f1cd10fb 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java @@ -48,8 +48,6 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.YangConstants; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; @@ -274,13 +272,13 @@ public class NetconfMessageTransformer implements MessageTransformer normalizedNode; final QName rpcQName = rpc.getLastComponent(); if (NetconfMessageTransformUtil.isDataRetrievalOperation(rpcQName)) { - final Element xmlData = NetconfMessageTransformUtil.getDataSubtree(message.getDocument()); - final AnyXmlNode anyXmlNode = Builders.anyXmlBuilder() - .withNodeIdentifier(NetconfMessageTransformUtil.NETCONF_DATA_NODEID) - .withValue(new DOMSource(xmlData)).build(); - normalizedNode = Builders.containerBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(NetconfMessageTransformUtil.NETCONF_RPC_REPLY_QNAME)) - .withChild(anyXmlNode).build(); + normalizedNode = Builders.containerBuilder() + .withNodeIdentifier(NetconfMessageTransformUtil.NETCONF_RPC_REPLY_NODEID) + .withChild(Builders.anyXmlBuilder() + .withNodeIdentifier(NetconfMessageTransformUtil.NETCONF_DATA_NODEID) + .withValue(new DOMSource(NetconfMessageTransformUtil.getDataSubtree(message.getDocument()))) + .build()) + .build(); } else { // Determine whether a base netconf operation is being invoked // and also check if the device exposed model for base netconf. -- 2.36.6