X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Futil%2FNetconfMessageTransformUtil.java;h=2f48d5403d106fe53f910f5e7faefc8f28dc49bc;hb=3b5e41839346a83c1d8d54b3d869e19d9e417063;hp=0a887bbbea7bf20caadbb296a89b08539bf3a8e3;hpb=8c558823627af9965084865247d1e9d43d46c3c6;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java index 0a887bbbea..2f48d5403d 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java @@ -7,10 +7,12 @@ */ package org.opendaylight.netconf.sal.connect.netconf.util; +import static org.opendaylight.netconf.util.NetconfUtil.NETCONF_DATA_QNAME; +import static org.opendaylight.netconf.util.NetconfUtil.NETCONF_QNAME; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; import java.io.IOException; import java.net.URI; import java.time.Instant; @@ -29,6 +31,7 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.FailedNetconfMessage; @@ -40,6 +43,7 @@ import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.notifications.NetconfNotification; import org.opendaylight.netconf.sal.connect.util.MessageCounter; import org.opendaylight.netconf.util.NetconfUtil; +import org.opendaylight.netconf.util.NodeContainerProxy; import org.opendaylight.netconf.util.messages.NetconfMessageUtil; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.edit.config.input.EditContent; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionInput; @@ -53,16 +57,16 @@ import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcError.ErrorSeverity; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -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.DOMSourceAnyxmlNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.codec.xml.XMLStreamNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; @@ -71,9 +75,11 @@ import org.opendaylight.yangtools.yang.data.impl.schema.SchemaOrderedNormalizedN import org.opendaylight.yangtools.yang.data.util.DataSchemaContextNode; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; 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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; @@ -86,7 +92,7 @@ public final class NetconfMessageTransformUtil { public static final String MESSAGE_ID_PREFIX = "m"; public static final String MESSAGE_ID_ATTR = "message-id"; - public static final QName CREATE_SUBSCRIPTION_RPC_QNAME = + public static final @NonNull QName CREATE_SUBSCRIPTION_RPC_QNAME = QName.create(CreateSubscriptionInput.QNAME, "create-subscription").intern(); private static final String SUBTREE = "subtree"; @@ -94,75 +100,83 @@ public final class NetconfMessageTransformUtil { private static final Document BLANK_DOCUMENT = XmlUtil.newDocument(); public static final String EVENT_TIME = "eventTime"; - private NetconfMessageTransformUtil() {} + private NetconfMessageTransformUtil() { + + } - public static final QName IETF_NETCONF_MONITORING = + public static final @NonNull QName IETF_NETCONF_MONITORING = QName.create(NetconfState.QNAME, "ietf-netconf-monitoring").intern(); - public static final QName GET_DATA_QNAME = QName.create(IETF_NETCONF_MONITORING, "data").intern(); - public static final QName GET_SCHEMA_QNAME = QName.create(IETF_NETCONF_MONITORING, "get-schema").intern(); - public static final QName IETF_NETCONF_MONITORING_SCHEMA_FORMAT = + public static final @NonNull QName GET_DATA_QNAME = QName.create(IETF_NETCONF_MONITORING, "data").intern(); + public static final @NonNull QName GET_SCHEMA_QNAME = QName.create(IETF_NETCONF_MONITORING, "get-schema").intern(); + public static final @NonNull QName IETF_NETCONF_MONITORING_SCHEMA_FORMAT = QName.create(IETF_NETCONF_MONITORING, "format").intern(); - public static final QName IETF_NETCONF_MONITORING_SCHEMA_LOCATION = + public static final @NonNull QName IETF_NETCONF_MONITORING_SCHEMA_LOCATION = QName.create(IETF_NETCONF_MONITORING, "location").intern(); - public static final QName IETF_NETCONF_MONITORING_SCHEMA_IDENTIFIER = + public static final @NonNull QName IETF_NETCONF_MONITORING_SCHEMA_IDENTIFIER = QName.create(IETF_NETCONF_MONITORING, "identifier").intern(); - public static final QName IETF_NETCONF_MONITORING_SCHEMA_VERSION = + public static final @NonNull QName IETF_NETCONF_MONITORING_SCHEMA_VERSION = QName.create(IETF_NETCONF_MONITORING, "version").intern(); - public static final QName IETF_NETCONF_MONITORING_SCHEMA_NAMESPACE = + public static final @NonNull QName IETF_NETCONF_MONITORING_SCHEMA_NAMESPACE = QName.create(IETF_NETCONF_MONITORING, "namespace").intern(); - public static final QName IETF_NETCONF_NOTIFICATIONS = + public static final @NonNull QName IETF_NETCONF_NOTIFICATIONS = QName.create(NetconfCapabilityChange.QNAME, "ietf-netconf-notifications").intern(); - public static final QName NETCONF_QNAME = - QName.create("urn:ietf:params:xml:ns:netconf:base:1.0", "2011-06-01", "netconf").intern(); public static final URI NETCONF_URI = NETCONF_QNAME.getNamespace(); - public static final QName NETCONF_DATA_QNAME = QName.create(NETCONF_QNAME, "data").intern(); - public static final NodeIdentifier NETCONF_DATA_NODEID = NodeIdentifier.create(NETCONF_DATA_QNAME); - - public static final QName NETCONF_RPC_REPLY_QNAME = QName.create(NETCONF_QNAME, "rpc-reply").intern(); - public static final QName NETCONF_OK_QNAME = QName.create(NETCONF_QNAME, "ok").intern(); - public static final QName NETCONF_ERROR_OPTION_QNAME = QName.create(NETCONF_QNAME, "error-option").intern(); - public static final NodeIdentifier NETCONF_ERROR_OPTION_NODEID = NodeIdentifier.create(NETCONF_ERROR_OPTION_QNAME); - public static final QName NETCONF_RUNNING_QNAME = QName.create(NETCONF_QNAME, "running").intern(); - public static final QName NETCONF_SOURCE_QNAME = QName.create(NETCONF_QNAME, "source").intern(); - public static final NodeIdentifier NETCONF_SOURCE_NODEID = NodeIdentifier.create(NETCONF_SOURCE_QNAME); - public static final QName NETCONF_CANDIDATE_QNAME = QName.create(NETCONF_QNAME, "candidate").intern(); - public static final QName NETCONF_TARGET_QNAME = QName.create(NETCONF_QNAME, "target").intern(); - public static final NodeIdentifier NETCONF_TARGET_NODEID = NodeIdentifier.create(NETCONF_TARGET_QNAME); - public static final QName NETCONF_CONFIG_QNAME = QName.create(NETCONF_QNAME, "config").intern(); - public static final NodeIdentifier NETCONF_CONFIG_NODEID = NodeIdentifier.create(NETCONF_CONFIG_QNAME); - - public static final QName NETCONF_COMMIT_QNAME = QName.create(NETCONF_QNAME, "commit").intern(); - public static final SchemaPath NETCONF_COMMIT_PATH = toPath(NETCONF_COMMIT_QNAME); - public static final QName NETCONF_VALIDATE_QNAME = QName.create(NETCONF_QNAME, "validate").intern(); - public static final NodeIdentifier NETCONF_VALIDATE_NODEID = NodeIdentifier.create(NETCONF_VALIDATE_QNAME); - public static final SchemaPath NETCONF_VALIDATE_PATH = toPath(NETCONF_VALIDATE_QNAME); - public static final QName NETCONF_COPY_CONFIG_QNAME = QName.create(NETCONF_QNAME, "copy-config").intern(); - public static final NodeIdentifier NETCONF_COPY_CONFIG_NODEID = NodeIdentifier.create(NETCONF_COPY_CONFIG_QNAME); - public static final SchemaPath NETCONF_COPY_CONFIG_PATH = toPath(NETCONF_COPY_CONFIG_QNAME); - - public static final QName NETCONF_OPERATION_QNAME = QName.create(NETCONF_QNAME, "operation").intern(); - private static final QName NETCONF_OPERATION_QNAME_LEGACY = NETCONF_OPERATION_QNAME.withoutRevision().intern(); - public static final QName NETCONF_DEFAULT_OPERATION_QNAME = + public static final @NonNull NodeIdentifier NETCONF_DATA_NODEID = NodeIdentifier.create(NETCONF_DATA_QNAME); + + public static final @NonNull QName NETCONF_RPC_REPLY_QNAME = QName.create(NETCONF_QNAME, "rpc-reply").intern(); + public static final @NonNull NodeIdentifier NETCONF_RPC_REPLY_NODEID = + NodeIdentifier.create(NETCONF_RPC_REPLY_QNAME); + + public static final @NonNull QName NETCONF_OK_QNAME = QName.create(NETCONF_QNAME, "ok").intern(); + public static final @NonNull QName NETCONF_ERROR_OPTION_QNAME = + QName.create(NETCONF_QNAME, "error-option").intern(); + public static final @NonNull NodeIdentifier NETCONF_ERROR_OPTION_NODEID = + NodeIdentifier.create(NETCONF_ERROR_OPTION_QNAME); + public static final @NonNull QName NETCONF_RUNNING_QNAME = QName.create(NETCONF_QNAME, "running").intern(); + public static final @NonNull QName NETCONF_SOURCE_QNAME = QName.create(NETCONF_QNAME, "source").intern(); + public static final @NonNull NodeIdentifier NETCONF_SOURCE_NODEID = NodeIdentifier.create(NETCONF_SOURCE_QNAME); + public static final @NonNull QName NETCONF_CANDIDATE_QNAME = QName.create(NETCONF_QNAME, "candidate").intern(); + public static final @NonNull QName NETCONF_TARGET_QNAME = QName.create(NETCONF_QNAME, "target").intern(); + public static final @NonNull NodeIdentifier NETCONF_TARGET_NODEID = NodeIdentifier.create(NETCONF_TARGET_QNAME); + public static final @NonNull QName NETCONF_CONFIG_QNAME = QName.create(NETCONF_QNAME, "config").intern(); + public static final @NonNull NodeIdentifier NETCONF_CONFIG_NODEID = NodeIdentifier.create(NETCONF_CONFIG_QNAME); + + public static final @NonNull QName NETCONF_COMMIT_QNAME = QName.create(NETCONF_QNAME, "commit").intern(); + public static final @NonNull SchemaPath NETCONF_COMMIT_PATH = toPath(NETCONF_COMMIT_QNAME); + public static final @NonNull QName NETCONF_VALIDATE_QNAME = QName.create(NETCONF_QNAME, "validate").intern(); + public static final @NonNull NodeIdentifier NETCONF_VALIDATE_NODEID = NodeIdentifier.create(NETCONF_VALIDATE_QNAME); + public static final @NonNull SchemaPath NETCONF_VALIDATE_PATH = toPath(NETCONF_VALIDATE_QNAME); + public static final @NonNull QName NETCONF_COPY_CONFIG_QNAME = QName.create(NETCONF_QNAME, "copy-config").intern(); + public static final @NonNull NodeIdentifier NETCONF_COPY_CONFIG_NODEID = + NodeIdentifier.create(NETCONF_COPY_CONFIG_QNAME); + public static final @NonNull SchemaPath NETCONF_COPY_CONFIG_PATH = toPath(NETCONF_COPY_CONFIG_QNAME); + + public static final @NonNull QName NETCONF_OPERATION_QNAME = QName.create(NETCONF_QNAME, "operation").intern(); + private static final @NonNull QName NETCONF_OPERATION_QNAME_LEGACY = + NETCONF_OPERATION_QNAME.withoutRevision().intern(); + public static final @NonNull QName NETCONF_DEFAULT_OPERATION_QNAME = QName.create(NETCONF_OPERATION_QNAME, "default-operation").intern(); - public static final NodeIdentifier NETCONF_DEFAULT_OPERATION_NODEID = + public static final @NonNull NodeIdentifier NETCONF_DEFAULT_OPERATION_NODEID = NodeIdentifier.create(NETCONF_DEFAULT_OPERATION_QNAME); - public static final QName NETCONF_EDIT_CONFIG_QNAME = QName.create(NETCONF_QNAME, "edit-config").intern(); - public static final NodeIdentifier NETCONF_EDIT_CONFIG_NODEID = NodeIdentifier.create(NETCONF_EDIT_CONFIG_QNAME); - public static final SchemaPath NETCONF_EDIT_CONFIG_PATH = toPath(NETCONF_EDIT_CONFIG_QNAME); - public static final QName NETCONF_GET_CONFIG_QNAME = QName.create(NETCONF_QNAME, "get-config"); - public static final NodeIdentifier NETCONF_GET_CONFIG_NODEID = NodeIdentifier.create(NETCONF_GET_CONFIG_QNAME); - public static final SchemaPath NETCONF_GET_CONFIG_PATH = toPath(NETCONF_GET_CONFIG_QNAME); - public static final QName NETCONF_DISCARD_CHANGES_QNAME = QName.create(NETCONF_QNAME, "discard-changes"); - public static final SchemaPath NETCONF_DISCARD_CHANGES_PATH = toPath(NETCONF_DISCARD_CHANGES_QNAME); - public static final QName NETCONF_TYPE_QNAME = QName.create(NETCONF_QNAME, "type").intern(); - public static final QName NETCONF_FILTER_QNAME = QName.create(NETCONF_QNAME, "filter").intern(); - public static final QName NETCONF_GET_QNAME = QName.create(NETCONF_QNAME, "get").intern(); - public static final NodeIdentifier NETCONF_GET_NODEID = NodeIdentifier.create(NETCONF_GET_QNAME); - public static final SchemaPath NETCONF_GET_PATH = toPath(NETCONF_GET_QNAME); - public static final QName NETCONF_RPC_QNAME = QName.create(NETCONF_QNAME, "rpc").intern(); + public static final @NonNull QName NETCONF_EDIT_CONFIG_QNAME = QName.create(NETCONF_QNAME, "edit-config").intern(); + public static final @NonNull NodeIdentifier NETCONF_EDIT_CONFIG_NODEID = + NodeIdentifier.create(NETCONF_EDIT_CONFIG_QNAME); + public static final @NonNull SchemaPath NETCONF_EDIT_CONFIG_PATH = toPath(NETCONF_EDIT_CONFIG_QNAME); + public static final @NonNull QName NETCONF_GET_CONFIG_QNAME = QName.create(NETCONF_QNAME, "get-config"); + public static final @NonNull NodeIdentifier NETCONF_GET_CONFIG_NODEID = + NodeIdentifier.create(NETCONF_GET_CONFIG_QNAME); + public static final @NonNull SchemaPath NETCONF_GET_CONFIG_PATH = toPath(NETCONF_GET_CONFIG_QNAME); + public static final @NonNull QName NETCONF_DISCARD_CHANGES_QNAME = QName.create(NETCONF_QNAME, "discard-changes"); + public static final @NonNull SchemaPath NETCONF_DISCARD_CHANGES_PATH = toPath(NETCONF_DISCARD_CHANGES_QNAME); + public static final @NonNull QName NETCONF_TYPE_QNAME = QName.create(NETCONF_QNAME, "type").intern(); + public static final @NonNull QName NETCONF_FILTER_QNAME = QName.create(NETCONF_QNAME, "filter").intern(); + public static final @NonNull QName NETCONF_GET_QNAME = QName.create(NETCONF_QNAME, "get").intern(); + public static final @NonNull NodeIdentifier NETCONF_GET_NODEID = NodeIdentifier.create(NETCONF_GET_QNAME); + public static final @NonNull SchemaPath NETCONF_GET_PATH = toPath(NETCONF_GET_QNAME); + public static final @NonNull QName NETCONF_RPC_QNAME = QName.create(NETCONF_QNAME, "rpc").intern(); public static final QName YANG_QNAME = null; public static final URI NETCONF_ACTION_NAMESPACE = URI.create("urn:ietf:params:xml:ns:yang:1"); public static final String NETCONF_ACTION = "action"; @@ -180,34 +194,36 @@ public final class NetconfMessageTransformUtil { public static final URI NETCONF_RUNNING_WRITABLE_URI = URI .create("urn:ietf:params:netconf:capability:writable-running:1.0"); - public static final QName NETCONF_LOCK_QNAME = QName.create(NETCONF_QNAME, "lock").intern(); - public static final NodeIdentifier NETCONF_LOCK_NODEID = NodeIdentifier.create(NETCONF_LOCK_QNAME); - public static final SchemaPath NETCONF_LOCK_PATH = toPath(NETCONF_LOCK_QNAME); - public static final QName NETCONF_UNLOCK_QNAME = QName.create(NETCONF_QNAME, "unlock").intern(); - public static final NodeIdentifier NETCONF_UNLOCK_NODEID = NodeIdentifier.create(NETCONF_UNLOCK_QNAME); - public static final SchemaPath NETCONF_UNLOCK_PATH = toPath(NETCONF_UNLOCK_QNAME); + public static final @NonNull QName NETCONF_LOCK_QNAME = QName.create(NETCONF_QNAME, "lock").intern(); + public static final @NonNull NodeIdentifier NETCONF_LOCK_NODEID = NodeIdentifier.create(NETCONF_LOCK_QNAME); + public static final @NonNull SchemaPath NETCONF_LOCK_PATH = toPath(NETCONF_LOCK_QNAME); + public static final @NonNull QName NETCONF_UNLOCK_QNAME = QName.create(NETCONF_QNAME, "unlock").intern(); + public static final @NonNull NodeIdentifier NETCONF_UNLOCK_NODEID = NodeIdentifier.create(NETCONF_UNLOCK_QNAME); + public static final @NonNull SchemaPath NETCONF_UNLOCK_PATH = toPath(NETCONF_UNLOCK_QNAME); - public static final NodeIdentifier EDIT_CONTENT_NODEID = NodeIdentifier.create(EditContent.QNAME); + public static final @NonNull NodeIdentifier EDIT_CONTENT_NODEID = NodeIdentifier.create(EditContent.QNAME); // Discard changes message - public static final ContainerNode DISCARD_CHANGES_RPC_CONTENT = Builders.containerBuilder() + public static final @NonNull ContainerNode DISCARD_CHANGES_RPC_CONTENT = Builders.containerBuilder() .withNodeIdentifier(NodeIdentifier.create(NETCONF_DISCARD_CHANGES_QNAME)).build(); // Commit changes message - public static final ContainerNode COMMIT_RPC_CONTENT = Builders.containerBuilder() + public static final @NonNull ContainerNode COMMIT_RPC_CONTENT = Builders.containerBuilder() .withNodeIdentifier(NodeIdentifier.create(NETCONF_COMMIT_QNAME)).build(); // Get message - public static final ContainerNode GET_RPC_CONTENT = Builders.containerBuilder() + public static final @NonNull ContainerNode GET_RPC_CONTENT = Builders.containerBuilder() .withNodeIdentifier(NETCONF_GET_NODEID).build(); // Create-subscription changes message - public static final ContainerNode CREATE_SUBSCRIPTION_RPC_CONTENT = Builders.containerBuilder() + public static final @NonNull ContainerNode CREATE_SUBSCRIPTION_RPC_CONTENT = Builders.containerBuilder() .withNodeIdentifier(NodeIdentifier.create(CREATE_SUBSCRIPTION_RPC_QNAME)).build(); - private static final NodeIdentifier NETCONF_FILTER_NODEID = NodeIdentifier.create(NETCONF_FILTER_QNAME); + public static final @NonNull SchemaPath CREATE_SUBSCRIPTION_RPC_PATH = toPath(CREATE_SUBSCRIPTION_RPC_QNAME); - public static final DataContainerChild EMPTY_FILTER; + public static final @NonNull NodeIdentifier NETCONF_FILTER_NODEID = NodeIdentifier.create(NETCONF_FILTER_QNAME); + + public static final @NonNull DataContainerChild EMPTY_FILTER; static { final Element element = XmlUtil.createElement(BLANK_DOCUMENT, NETCONF_FILTER_QNAME.getLocalName(), @@ -220,7 +236,7 @@ public final class NetconfMessageTransformUtil { } public static DataContainerChild toFilterStructure(final YangInstanceIdentifier identifier, - final SchemaContext ctx) { + final EffectiveModelContext ctx) { final Element element = XmlUtil.createElement(BLANK_DOCUMENT, NETCONF_FILTER_QNAME.getLocalName(), Optional.of(NETCONF_FILTER_QNAME.getNamespace().toString())); element.setAttributeNS(NETCONF_FILTER_QNAME.getNamespace().toString(), NETCONF_TYPE_QNAME.getLocalName(), @@ -320,29 +336,29 @@ public final class NetconfMessageTransformUtil { || NETCONF_GET_QNAME.getLocalName().equals(rpc.getLocalName())); } - public static ContainerSchemaNode createSchemaForDataRead(final SchemaContext schemaContext) { + public static @NonNull ContainerSchemaNode createSchemaForDataRead(final SchemaContext schemaContext) { return new NodeContainerProxy(NETCONF_DATA_QNAME, schemaContext.getChildNodes()); } - public static ContainerSchemaNode createSchemaForNotification(final NotificationDefinition next) { + public static @NonNull ContainerSchemaNode createSchemaForNotification(final NotificationDefinition next) { return new NodeContainerProxy(next.getQName(), next.getChildNodes(), next.getAvailableAugmentations()); } @Deprecated - public static ContainerNode wrap(final QName name, final DataContainerChild... node) { + public static @NonNull ContainerNode wrap(final QName name, final DataContainerChild... node) { return wrap(toId(name), node); } - public static ContainerNode wrap(final NodeIdentifier name, final DataContainerChild... node) { + public static @NonNull ContainerNode wrap(final NodeIdentifier name, final DataContainerChild... node) { return Builders.containerBuilder().withNodeIdentifier(name).withValue(ImmutableList.copyOf(node)).build(); } - public static AnyXmlNode createEditConfigAnyxml( - final SchemaContext ctx, final YangInstanceIdentifier dataPath, + public static DOMSourceAnyxmlNode createEditConfigAnyxml( + final EffectiveModelContext ctx, final YangInstanceIdentifier dataPath, final Optional operation, final Optional> lastChildOverride) { final NormalizedNode configContent; - + final NormalizedMetadata metadata; if (dataPath.isEmpty()) { Preconditions.checkArgument(lastChildOverride.isPresent(), "Data has to be present when creating structure for top level element"); @@ -350,11 +366,12 @@ public final class NetconfMessageTransformUtil { "Data has to be either container or a list node when creating structure for top level element, " + "but was: %s", lastChildOverride.get()); configContent = lastChildOverride.get(); + metadata = null; } else { configContent = ImmutableNodes.fromInstanceId(ctx, dataPath, lastChildOverride); + metadata = operation.map(oper -> leafMetadata(dataPath, oper)).orElse(null); } - final NormalizedMetadata metadata = operation.map(oper -> leafMetadata(configContent, oper)).orElse(null); final Element element = XmlUtil.createElement(BLANK_DOCUMENT, NETCONF_CONFIG_QNAME.getLocalName(), Optional.of(NETCONF_CONFIG_QNAME.getNamespace().toString())); @@ -368,30 +385,14 @@ public final class NetconfMessageTransformUtil { .build(); } - private static NormalizedMetadata leafMetadata(final NormalizedNode node, final ModifyAction oper) { - final Deque builders = new ArrayDeque<>(); + private static NormalizedMetadata leafMetadata(final YangInstanceIdentifier path, final ModifyAction oper) { + final List args = path.getPathArguments(); + final Deque builders = new ArrayDeque<>(args.size()); // Step one: open builders - NormalizedNode currentNode = node; - do { - builders.push(ImmutableNormalizedMetadata.builder().withIdentifier(currentNode.getIdentifier())); - if (currentNode instanceof NormalizedNodeContainer) { - final Collection> children = - ((NormalizedNodeContainer>) currentNode).getValue(); - switch (children.size()) { - case 0: - currentNode = null; - break; - case 1: - currentNode = Iterables.getOnlyElement(children); - break; - default: - throw new IllegalStateException("Unexpected container " + currentNode); - } - } else { - currentNode = null; - } - } while (currentNode != null); + for (PathArgument arg : args) { + builders.push(ImmutableNormalizedMetadata.builder().withIdentifier(arg)); + } // Step two: set the top builder's metadata builders.peek().withAnnotation(NETCONF_OPERATION_QNAME_LEGACY, oper.toString().toLowerCase(Locale.US)); @@ -408,14 +409,14 @@ public final class NetconfMessageTransformUtil { } } - public static DataContainerChild createEditConfigStructure(final SchemaContext ctx, + public static DataContainerChild createEditConfigStructure(final EffectiveModelContext ctx, final YangInstanceIdentifier dataPath, final Optional operation, final Optional> lastChildOverride) { return Builders.choiceBuilder().withNodeIdentifier(EDIT_CONTENT_NODEID) .withChild(createEditConfigAnyxml(ctx, dataPath, operation, lastChildOverride)).build(); } - public static SchemaPath toPath(final QName rpc) { + public static @NonNull SchemaPath toPath(final QName rpc) { return SchemaPath.ROOT.createChild(rpc); } @@ -466,8 +467,7 @@ public final class NetconfMessageTransformUtil { } public static DOMResult prepareDomResultForActionRequest(final DataSchemaContextTree dataSchemaContextTree, - final DOMDataTreeIdentifier domDataTreeIdentifier, final SchemaPath actionSchemaPath, - final MessageCounter counter, final String action) { + final DOMDataTreeIdentifier domDataTreeIdentifier, final MessageCounter counter, final QName action) { final Document document = XmlUtil.newDocument(); final Element rpcNS = document.createElementNS(NETCONF_RPC_QNAME.getNamespace().toString(), NETCONF_RPC_QNAME.getLocalName()); @@ -479,7 +479,8 @@ public final class NetconfMessageTransformUtil { final Element actionData = prepareActionData(rootSchemaContextNode, actionNS, domDataTreeIdentifier.getRootIdentifier().getPathArguments().iterator(), document); - Element specificActionElement = document.createElement(action); + final Element specificActionElement = + document.createElementNS(action.getNamespace().toString(), action.getLocalName()); actionData.appendChild(specificActionElement); rpcNS.appendChild(actionNS); document.appendChild(rpcNS); @@ -491,7 +492,7 @@ public final class NetconfMessageTransformUtil { if (iterator.hasNext()) { final PathArgument next = iterator.next(); - DataSchemaContextNode current = currentParentSchemaNode.getChild(next); + final DataSchemaContextNode current = currentParentSchemaNode.getChild(next); Preconditions.checkArgument(current != null, "Invalid input: schema for argument %s not found", next); if (current.isMixin()) { @@ -502,9 +503,9 @@ public final class NetconfMessageTransformUtil { final Element actualElement = document.createElementNS(actualNS.getNamespace().toString(), actualNS.getLocalName()); if (next instanceof NodeWithValue) { - actualElement.setNodeValue(((NodeWithValue) next).getValue().toString()); + actualElement.setNodeValue(((NodeWithValue) next).getValue().toString()); } else if (next instanceof NodeIdentifierWithPredicates) { - for (Entry entry : ((NodeIdentifierWithPredicates) next).getKeyValues().entrySet()) { + for (Entry entry : ((NodeIdentifierWithPredicates) next).entrySet()) { final Element entryElement = document.createElementNS(entry.getKey().getNamespace().toString(), entry.getKey().getLocalName()); entryElement.setTextContent(entry.getValue().toString()); @@ -520,15 +521,19 @@ public final class NetconfMessageTransformUtil { } @SuppressWarnings("checkstyle:IllegalCatch") - public static void writeNormalizedRpc(final ContainerNode normalized, final DOMResult result, - final SchemaPath schemaPath, - final SchemaContext baseNetconfCtx) throws IOException, XMLStreamException { + public static void writeNormalizedOperationInput(final ContainerNode normalized, final DOMResult result, + final Absolute operationPath, final EffectiveModelContext baseNetconfCtx) + throws IOException, XMLStreamException { + final QName inputQName = YangConstants.operationInputQName(operationPath.lastNodeIdentifier().getModule()); + // FIXME: eliminate this conversion + final SchemaPath inputPath = operationPath.asSchemaPath().createChild(inputQName); + final XMLStreamWriter writer = NetconfUtil.XML_FACTORY.createXMLStreamWriter(result); try { try (NormalizedNodeStreamWriter normalizedNodeStreamWriter = - XMLStreamNormalizedNodeStreamWriter.create(writer, baseNetconfCtx, schemaPath)) { + XMLStreamNormalizedNodeStreamWriter.create(writer, baseNetconfCtx, inputPath)) { try (SchemaOrderedNormalizedNodeWriter normalizedNodeWriter = - new SchemaOrderedNormalizedNodeWriter(normalizedNodeStreamWriter, baseNetconfCtx, schemaPath)) { + new SchemaOrderedNormalizedNodeWriter(normalizedNodeStreamWriter, baseNetconfCtx, inputPath)) { final Collection> value = normalized.getValue(); normalizedNodeWriter.write(value); normalizedNodeWriter.flush();