Bump MRI upstreams

[netconf.git] / netconf / sal-netconf-connector / src / main / java / org / opendaylight / netconf / sal / connect / netconf / schema / mapping / BaseRpcSchemalessTransformer.java

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformer.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformer.java
index 6cec8afe814caf4ee428d7d6d2b2bfcb434e9497..57e0c2a72e6298fa82514189a76db1e416b9dad2 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformer.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseRpcSchemalessTransformer.java
@@ -8,8 +8,8 @@
 package org.opendaylight.netconf.sal.connect.netconf.schema.mapping;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
-import java.util.Map;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
@@ -23,14 +23,13 @@ import org.opendaylight.netconf.sal.connect.api.MessageTransformer;
 import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil;
 import org.opendaylight.netconf.sal.connect.util.MessageCounter;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.YangConstants;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -38,13 +37,14 @@ import org.w3c.dom.Element;
  * Transforms base netconf RPCs.
  */
 public class BaseRpcSchemalessTransformer implements MessageTransformer<NetconfMessage> {
-
-    private static final Map<QName, ? extends RpcDefinition> MAPPED_RPCS = BaseSchema.BASE_NETCONF_CTX.getMappedRpcs();
-    private static final SchemaContext SCHEMA_CONTEXT = BaseSchema.BASE_NETCONF_CTX.getSchemaContext();
-
+    private final ImmutableMap<QName, ? extends RpcDefinition> mappedRpcs;
+    private final EffectiveModelContext modelContext;
     private final MessageCounter counter;
 
-    public BaseRpcSchemalessTransformer(final MessageCounter counter) {
+    public BaseRpcSchemalessTransformer(final BaseNetconfSchemas baseSchemas, final MessageCounter counter) {
+        final BaseSchema baseSchema = baseSchemas.getBaseSchema();
+        mappedRpcs = baseSchema.getMappedRpcs();
+        modelContext = baseSchema.getEffectiveModelContext();
         this.counter = counter;
     }
 
@@ -54,30 +54,26 @@ public class BaseRpcSchemalessTransformer implements MessageTransformer<NetconfM
     }
 
     @Override
-    public NetconfMessage toRpcRequest(final SchemaPath rpc, final NormalizedNode<?, ?> payload) {
+    public NetconfMessage toRpcRequest(final QName rpc, final NormalizedNode payload) {
         // In case no input for rpc is defined, we can simply construct the payload here
-        final QName rpcQName = rpc.getLastComponent();
 
-        final RpcDefinition mappedRpc = Preconditions.checkNotNull(MAPPED_RPCS.get(rpcQName),
-            "Unknown rpc %s, available rpcs: %s", rpcQName, MAPPED_RPCS.keySet());
-        final DOMResult domResult = NetconfMessageTransformUtil.prepareDomResultForRpcRequest(rpcQName, counter);
+        final RpcDefinition mappedRpc = Preconditions.checkNotNull(mappedRpcs.get(rpc),
+            "Unknown rpc %s, available rpcs: %s", rpc, mappedRpcs.keySet());
+        final DOMResult domResult = NetconfMessageTransformUtil.prepareDomResultForRpcRequest(rpc, counter);
         if (mappedRpc.getInput().getChildNodes().isEmpty()) {
             return new NetconfMessage(domResult.getNode().getOwnerDocument());
         }
 
-        Preconditions.checkNotNull(payload, "Transforming an rpc with input: %s, payload cannot be null", rpcQName);
+        Preconditions.checkNotNull(payload, "Transforming an rpc with input: %s, payload cannot be null", rpc);
         Preconditions.checkArgument(payload instanceof ContainerNode,
-                "Transforming an rpc with input: %s, payload has to be a container, but was: %s", rpcQName, payload);
+                "Transforming an rpc with input: %s, payload has to be a container, but was: %s", rpc, payload);
 
-        // Set the path to the input of rpc for the payload stream writer
-        final SchemaPath inputPath = rpc.createChild(YangConstants.operationInputQName(rpcQName.getModule()));
         final DOMResult result = domResult;
-
         try {
-            NetconfMessageTransformUtil.writeNormalizedRpc((ContainerNode) payload, result,
-                    inputPath, SCHEMA_CONTEXT);
+            NetconfMessageTransformUtil.writeNormalizedOperationInput((ContainerNode) payload, result, Absolute.of(rpc),
+                modelContext);
         } catch (final XMLStreamException | IOException | IllegalStateException e) {
-            throw new IllegalStateException("Unable to serialize " + inputPath, e);
+            throw new IllegalStateException("Unable to serialize input of " + rpc, e);
         }
 
         final Document node = result.getNode().getOwnerDocument();
@@ -86,10 +82,9 @@ public class BaseRpcSchemalessTransformer implements MessageTransformer<NetconfM
     }
 
     @Override
-    public DOMRpcResult toRpcResult(final NetconfMessage message, final SchemaPath rpc) {
-        final NormalizedNode<?, ?> normalizedNode;
-        final QName rpcQName = rpc.getLastComponent();
-        if (NetconfMessageTransformUtil.isDataRetrievalOperation(rpcQName)) {
+    public DOMRpcResult toRpcResult(final NetconfMessage message, final QName rpc) {
+        final NormalizedNode normalizedNode;
+        if (NetconfMessageTransformUtil.isDataRetrievalOperation(rpc)) {
             final Element xmlData = NetconfMessageTransformUtil.getDataSubtree(message.getDocument());
             final Document data = XmlUtil.newDocument();
             data.appendChild(data.importNode(xmlData, true));
@@ -104,7 +99,7 @@ public class BaseRpcSchemalessTransformer implements MessageTransformer<NetconfM
         } else {
             //other base rpcs don't have any output, we can simply construct the payload here
             Preconditions.checkArgument(isOkPresent(message.getDocument()),
-                    "Unexpected content in response of rpc: %s, %s", rpc.getLastComponent(), message);
+                    "Unexpected content in response of rpc: %s, %s", rpc, message);
             normalizedNode = null;
 
         }