From 9c5bddf6fe027e4cb87f07819fc8ec51130fabd0 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 29 Jan 2024 16:57:07 +0100 Subject: [PATCH] Clean up netconf-client-mdsal warnings The bump to mdsal-13 is causing a large number of warnings, start fixing them up. Change-Id: I0dde1197b9ed0026b0e7de3177b6d0411ff15a53 Signed-off-by: Robert Varga --- plugins/netconf-client-mdsal/pom.xml | 8 ++++++ .../client/mdsal/LibraryModulesSchemas.java | 4 +-- .../mdsal/MonitoringSchemaSourceProvider.java | 8 +++--- .../netconf/client/mdsal/NetconfDevice.java | 3 +-- .../client/mdsal/NetconfStateSchemas.java | 6 ++--- .../client/mdsal/impl/NetconfBaseOps.java | 23 ++++++++-------- .../impl/NetconfMessageTransformUtil.java | 27 ++++++++++++------- .../mdsal/impl/NetconfMessageTransformer.java | 16 +++++------ .../impl/SchemalessMessageTransformer.java | 6 ++--- .../SchemalessRpcStructureTransformer.java | 8 +++--- .../MonitoringSchemaSourceProviderTest.java | 6 ++--- .../client/mdsal/NetconfToRpcRequestTest.java | 5 ++-- .../BaseRpcSchemalessTransformerTest.java | 13 +++++---- .../client/mdsal/impl/NetconfBaseOpsTest.java | 2 +- .../impl/NetconfMessageTransformerTest.java | 15 +++++------ ...SchemalessRpcStructureTransformerTest.java | 6 ++--- ...KeepaliveSalFacadeResponseWaitingTest.java | 4 +-- .../mdsal/spi/KeepaliveSalFacadeTest.java | 4 +-- .../mdsal/spi/NetconfDeviceRpcTest.java | 7 ++--- .../spi/NetconfDeviceWriteOnlyTxTest.java | 6 +++-- .../netconf/client/mdsal/spi/TxTestUtils.java | 5 ++-- .../spi/WriteCandidateRunningTxTest.java | 9 +++---- 22 files changed, 101 insertions(+), 90 deletions(-) diff --git a/plugins/netconf-client-mdsal/pom.xml b/plugins/netconf-client-mdsal/pom.xml index 19207ecc20..7f2e04ca3e 100644 --- a/plugins/netconf-client-mdsal/pom.xml +++ b/plugins/netconf-client-mdsal/pom.xml @@ -80,6 +80,10 @@ org.opendaylight.yangtools yang-data-impl + + org.opendaylight.yangtools + yang-data-spi + org.opendaylight.yangtools yang-data-util @@ -144,6 +148,10 @@ org.opendaylight.mdsal.binding.model.ietf rfc6991-ietf-inet-types + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + org.opendaylight.mdsal.binding.model.ietf rfc8525 diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java index 091e2ab63e..7c6c7b898a 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java @@ -67,9 +67,9 @@ import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactory; import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier; import org.opendaylight.yangtools.yang.data.codec.gson.JsonParserStream; import org.opendaylight.yangtools.yang.data.codec.xml.XmlParserStream; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.NormalizationResultHolder; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.source.SourceIdentifier; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; @@ -111,7 +111,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas { private static final YangInstanceIdentifier MODULES_STATE_MODULE_LIST = YangInstanceIdentifier.of(MODULES_STATE_NID, MODULE_NID); - private static final @NonNull ContainerNode GET_MODULES_STATE_MODULE_LIST_RPC = Builders.containerBuilder() + private static final @NonNull ContainerNode GET_MODULES_STATE_MODULE_LIST_RPC = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NETCONF_GET_NODEID) .withChild(NetconfMessageTransformUtil.toFilterStructure(MODULES_STATE_MODULE_LIST, LIBRARY_CONTEXT)) .build(); diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProvider.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProvider.java index a20df879ed..69340c5bbb 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProvider.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProvider.java @@ -28,8 +28,7 @@ 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.LeafNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.source.SourceIdentifier; import org.opendaylight.yangtools.yang.model.api.source.YangTextSource; import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceProvider; @@ -51,8 +50,7 @@ public final class MonitoringSchemaSourceProvider implements SchemaSourceProvide NodeIdentifier.create(QName.create(GetSchema.QNAME, "identifier").intern()); private static final NodeIdentifier VERSION_PATHARG = NodeIdentifier.create(QName.create(GetSchema.QNAME, "version").intern()); - private static final LeafNode FORMAT_LEAF = - Builders.leafBuilder().withNodeIdentifier(FORMAT_PATHARG).withValue(Yang.QNAME).build(); + private static final LeafNode FORMAT_LEAF = ImmutableNodes.leafNode(FORMAT_PATHARG, Yang.QNAME); private static final NodeIdentifier NETCONF_DATA_PATHARG = NodeIdentifier.create(Data.QNAME); private final DOMRpcService rpc; @@ -65,7 +63,7 @@ public final class MonitoringSchemaSourceProvider implements SchemaSourceProvide public static @NonNull ContainerNode createGetSchemaRequest(final String moduleName, final Optional revision) { - final var builder = Builders.containerBuilder() + final var builder = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(GET_SCHEMA_PATHARG) .withChild(ImmutableNodes.leafNode(IDENTIFIER_PATHARG, moduleName)) .withChild(FORMAT_LEAF); diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java index 1e3ca9148b..124eb16b76 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java @@ -67,7 +67,6 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.MountPointContext; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.source.SourceIdentifier; @@ -189,7 +188,7 @@ public class NetconfDevice implements RemoteDevice { // Perhaps add a default schema context to support create-subscription if the model was not provided // (same as what we do for base netconf operations in transformer) final var rpcResultListenableFuture = deviceRpc.domRpcService() - .invokeRpc(CreateSubscription.QNAME, Builders.containerBuilder() + .invokeRpc(CreateSubscription.QNAME, ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NodeIdentifier.create(CreateSubscriptionInput.QNAME)) // Note: default 'stream' is 'NETCONF', we do not need to create an explicit leaf .build()); diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfStateSchemas.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfStateSchemas.java index 86f61a016f..97703a79c1 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfStateSchemas.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfStateSchemas.java @@ -54,7 +54,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,9 +90,9 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas { Schemas.QNAME.getLocalName())); filterElem.appendChild(stateElem); - GET_SCHEMAS_RPC = Builders.containerBuilder() + GET_SCHEMAS_RPC = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(new NodeIdentifier(GetInput.QNAME)) - .withChild(Builders.anyXmlBuilder() + .withChild(ImmutableNodes.newAnyxmlBuilder(DOMSource.class) .withNodeIdentifier(new NodeIdentifier(Filter.QNAME)) .withValue(new DOMSource(filterElem)) .build()) diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOps.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOps.java index 1d0483adc2..2be4bd7b7d 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOps.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOps.java @@ -63,8 +63,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.MountPointContext; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; /** * Provides base operations for NETCONF e.g. {@code get}, {@code get-config}, {@code edit-config}, {@code commit} etc. @@ -355,7 +354,7 @@ public final class NetconfBaseOps { public ChoiceNode createEditConfigStructure(final Optional lastChild, final Optional operation, final YangInstanceIdentifier dataPath) { - return Builders.choiceBuilder() + return ImmutableNodes.newChoiceBuilder() .withNodeIdentifier(EDIT_CONTENT_NODEID) .withChild(transformer.createEditConfigStructure(lastChild, dataPath, operation)) .build(); @@ -364,7 +363,7 @@ public final class NetconfBaseOps { private static ContainerNode getEditConfigContent(final NodeIdentifier datastore, final DataContainerChild editStructure, final Optional defaultOperation, final boolean rollback) { - final var editBuilder = Builders.containerBuilder() + final var editBuilder = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NETCONF_EDIT_CONFIG_NODEID) // Target .withChild(getTargetNode(datastore)); @@ -384,9 +383,9 @@ public final class NetconfBaseOps { } public static @NonNull ContainerNode getSourceNode(final NodeIdentifier datastore) { - return Builders.containerBuilder() + return ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NETCONF_SOURCE_NODEID) - .withChild(Builders.choiceBuilder() + .withChild(ImmutableNodes.newChoiceBuilder() .withNodeIdentifier(CONFIG_SOURCE_NODEID) .withChild(ImmutableNodes.leafNode(datastore, Empty.value())) .build()) @@ -394,16 +393,16 @@ public final class NetconfBaseOps { } public static @NonNull ContainerNode getLockContent(final NodeIdentifier datastore) { - return Builders.containerBuilder() + return ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NETCONF_LOCK_NODEID) .withChild(getTargetNode(datastore)) .build(); } public static @NonNull ContainerNode getTargetNode(final NodeIdentifier datastore) { - return Builders.containerBuilder() + return ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NETCONF_TARGET_NODEID) - .withChild(Builders.choiceBuilder() + .withChild(ImmutableNodes.newChoiceBuilder() .withNodeIdentifier(CONFIG_TARGET_NODEID) .withChild(ImmutableNodes.leafNode(datastore, Empty.value())) .build()) @@ -412,7 +411,7 @@ public final class NetconfBaseOps { public static @NonNull ContainerNode getCopyConfigContent(final NodeIdentifier sourceDatastore, final NodeIdentifier targetDatastore) { - return Builders.containerBuilder() + return ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NETCONF_COPY_CONFIG_NODEID) .withChild(getTargetNode(targetDatastore)) .withChild(getSourceNode(sourceDatastore)) @@ -420,14 +419,14 @@ public final class NetconfBaseOps { } public static @NonNull ContainerNode getValidateContent(final NodeIdentifier sourceDatastore) { - return Builders.containerBuilder() + return ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NETCONF_VALIDATE_NODEID) .withChild(getSourceNode(sourceDatastore)) .build(); } public static @NonNull ContainerNode getUnLockContent(final NodeIdentifier datastore) { - return Builders.containerBuilder() + return ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NETCONF_UNLOCK_NODEID) .withChild(getTargetNode(datastore)) .build(); diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformUtil.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformUtil.java index 5e61f2f88d..68c2982342 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformUtil.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformUtil.java @@ -70,11 +70,11 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.YangInstanceIdentifierWriter; import org.opendaylight.yangtools.yang.data.codec.xml.XMLStreamNormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedMetadata; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.NormalizationResultHolder; import org.opendaylight.yangtools.yang.data.impl.schema.SchemaOrderedNormalizedNodeWriter; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.data.util.DataSchemaContext; import org.opendaylight.yangtools.yang.data.util.DataSchemaContext.PathMixin; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; @@ -139,15 +139,15 @@ public final class NetconfMessageTransformUtil { public static final @NonNull NodeIdentifier EDIT_CONTENT_NODEID = NodeIdentifier.create(EditContent.QNAME); // Discard changes message - public static final @NonNull ContainerNode DISCARD_CHANGES_RPC_CONTENT = Builders.containerBuilder() + public static final @NonNull ContainerNode DISCARD_CHANGES_RPC_CONTENT = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NodeIdentifier.create(DiscardChangesInput.QNAME)).build(); // Commit changes message - public static final @NonNull ContainerNode COMMIT_RPC_CONTENT = Builders.containerBuilder() + public static final @NonNull ContainerNode COMMIT_RPC_CONTENT = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NodeIdentifier.create(CommitInput.QNAME)).build(); // Get message - public static final @NonNull ContainerNode GET_RPC_CONTENT = Builders.containerBuilder() + public static final @NonNull ContainerNode GET_RPC_CONTENT = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NETCONF_GET_NODEID).build(); public static final @NonNull AnyxmlNode EMPTY_FILTER = buildFilterStructure(newFilterElement()); @@ -206,7 +206,7 @@ public final class NetconfMessageTransformUtil { } private static AnyxmlNode buildFilterStructure(final Element element) { - return Builders.anyXmlBuilder() + return ImmutableNodes.newAnyxmlBuilder(DOMSource.class) .withNodeIdentifier(new NodeIdentifier(Filter.QNAME)) .withValue(new DOMSource(element)) .build(); @@ -236,7 +236,10 @@ public final class NetconfMessageTransformUtil { } public static @NonNull ContainerNode wrap(final NodeIdentifier name, final DataContainerChild... node) { - return Builders.containerBuilder().withNodeIdentifier(name).withValue(ImmutableList.copyOf(node)).build(); + return ImmutableNodes.newContainerBuilder() + .withNodeIdentifier(name) + .withValue(ImmutableList.copyOf(node)) + .build(); } /** @@ -283,8 +286,10 @@ public final class NetconfMessageTransformUtil { throw new IllegalStateException("Unable to serialize edit config content element for path " + dataPath, e); } - return Builders.anyXmlBuilder().withNodeIdentifier(NETCONF_CONFIG_NODEID).withValue(new DOMSource(element)) - .build(); + return ImmutableNodes.newAnyxmlBuilder(DOMSource.class) + .withNodeIdentifier(NETCONF_CONFIG_NODEID) + .withValue(new DOMSource(element)) + .build(); } private static NormalizedMetadata leafMetadata(final YangInstanceIdentifier path, final EffectiveOperation oper) { @@ -322,8 +327,10 @@ public final class NetconfMessageTransformUtil { 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(); + return ImmutableNodes.newChoiceBuilder() + .withNodeIdentifier(EDIT_CONTENT_NODEID) + .withChild(createEditConfigAnyxml(ctx, dataPath, operation, lastChildOverride)) + .build(); } public static @NonNull Absolute toPath(final QName rpc) { diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java index 51476e82c1..a09d4443bc 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java @@ -70,9 +70,9 @@ import org.opendaylight.yangtools.yang.data.api.schema.MountPointContext; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.codec.xml.XmlParserStream; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.NormalizationResultHolder; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.ActionDefinition; import org.opendaylight.yangtools.yang.model.api.ActionNodeContainer; @@ -404,13 +404,13 @@ public class NetconfMessageTransformer final var message = resultPayload.getResult(); final ContainerNode normalizedNode; if (NetconfMessageTransformUtil.isDataRetrievalOperation(rpc)) { - 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(); + normalizedNode = ImmutableNodes.newContainerBuilder() + .withNodeIdentifier(NetconfMessageTransformUtil.NETCONF_RPC_REPLY_NODEID) + .withChild(ImmutableNodes.newAnyxmlBuilder(DOMSource.class) + .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. diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformer.java index b5aae3bdd2..5f835ffc7d 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformer.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformer.java @@ -17,7 +17,7 @@ import org.opendaylight.netconf.client.mdsal.api.RpcTransformer; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -49,9 +49,9 @@ public class SchemalessMessageTransformer implements NotificationTransformer, Rp + message + ", cannot find namespace", e); } - return new NetconfMessageTransformer.NetconfDeviceNotification(Builders.containerBuilder() + return new NetconfMessageTransformer.NetconfDeviceNotification(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(SCHEMALESS_NOTIFICATION_PAYLOAD) - .withChild(Builders.anyXmlBuilder() + .withChild(ImmutableNodes.newAnyxmlBuilder(DOMSource.class) .withNodeIdentifier(new NodeIdentifier(notificationNoRev)) .withValue(new DOMSource(stripped.getValue().getDomElement())) .build()) diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessRpcStructureTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessRpcStructureTransformer.java index 8ad942e2b5..81154abb41 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessRpcStructureTransformer.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessRpcStructureTransformer.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.AnyxmlNode; 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.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -60,7 +60,7 @@ class SchemalessRpcStructureTransformer implements RpcStructureTransformer { for (var xmlElement : selectMatchingNodes(getSourceElement(anyxml.body()), path)) { dataElement.appendChild(result.importNode(xmlElement.getDomElement(), true)); } - return Optional.of(Builders.anyXmlBuilder() + return Optional.of(ImmutableNodes.newAnyxmlBuilder(DOMSource.class) .withNodeIdentifier(NETCONF_DATA_NODEID) .withValue(new DOMSource(result)) .build()); @@ -102,7 +102,7 @@ class SchemalessRpcStructureTransformer implements RpcStructureTransformer { operation.ifPresent(modifyAction -> setOperationAttribute(modifyAction, document, dataNode)); //append data parentXmlStructure.appendChild(document.importNode(dataNode, true)); - return Builders.anyXmlBuilder() + return ImmutableNodes.newAnyxmlBuilder(DOMSource.class) .withNodeIdentifier(NETCONF_CONFIG_NODEID) .withValue(new DOMSource(document.getDocumentElement())) .build(); @@ -139,7 +139,7 @@ class SchemalessRpcStructureTransformer implements RpcStructureTransformer { } private static AnyxmlNode buildFilterXmlNode(final Document document) { - return Builders.anyXmlBuilder() + return ImmutableNodes.newAnyxmlBuilder(DOMSource.class) .withNodeIdentifier(new NodeIdentifier(Filter.QNAME)) .withValue(new DOMSource(document.getDocumentElement())) .build(); diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProviderTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProviderTest.java index 3b0f632a6d..966e79fe00 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProviderTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/MonitoringSchemaSourceProviderTest.java @@ -33,7 +33,7 @@ import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.source.SourceIdentifier; import org.opendaylight.yangtools.yang.model.api.source.YangTextSource; import org.w3c.dom.Document; @@ -75,9 +75,9 @@ public class MonitoringSchemaSourceProviderTest { Document xmlDoc = UntrustedXML.newDocumentBuilder().newDocument(); Element root = xmlDoc.createElement("data"); root.setTextContent("module test {}"); - return Builders.containerBuilder() + return ImmutableNodes.newContainerBuilder() .withNodeIdentifier(id) - .withChild(Builders.anyXmlBuilder() + .withChild(ImmutableNodes.newAnyxmlBuilder(DOMSource.class) .withNodeIdentifier(childId) .withValue(new DOMSource(root)) .build()) diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToRpcRequestTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToRpcRequestTest.java index c87c15f69b..a2f89b82aa 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToRpcRequestTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToRpcRequestTest.java @@ -24,8 +24,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MountPointContext; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -66,7 +65,7 @@ public class NetconfToRpcRequestTest extends AbstractBaseSchemasTest { @Test public void testUserDefinedRpcCall() throws Exception { - final ContainerNode root = Builders.containerBuilder() + final ContainerNode root = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(toId(SUBSCRIBE_RPC_NAME)) .withChild(ImmutableNodes.leafNode(STREAM_NAME, "NETCONF")) .build(); diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java index 2d127180ed..bdcd255c77 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java @@ -25,8 +25,7 @@ import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.w3c.dom.Element; import org.xmlunit.builder.DiffBuilder; @@ -37,11 +36,11 @@ public class BaseRpcSchemalessTransformerTest extends AbstractBaseSchemasTest { @Test public void toRpcRequest() throws Exception { final var msg = transformer.toRpcRequest(EditConfig.QNAME, - Builders.containerBuilder() + ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NetconfMessageTransformUtil.NETCONF_EDIT_CONFIG_NODEID) - .withChild(Builders.choiceBuilder() + .withChild(ImmutableNodes.newChoiceBuilder() .withNodeIdentifier(new NodeIdentifier(EditContent.QNAME)) - .withChild(Builders.anyXmlBuilder() + .withChild(ImmutableNodes.newAnyxmlBuilder(DOMSource.class) .withNodeIdentifier(NetconfMessageTransformUtil.NETCONF_CONFIG_NODEID) .withValue(new DOMSource(XmlUtil.readXmlToDocument( BaseRpcSchemalessTransformerTest.class.getResourceAsStream( @@ -49,9 +48,9 @@ public class BaseRpcSchemalessTransformerTest extends AbstractBaseSchemasTest { .getDocumentElement())) .build()) .build()) - .withChild(Builders.containerBuilder() + .withChild(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NetconfMessageTransformUtil.NETCONF_TARGET_NODEID) - .withChild(Builders.choiceBuilder() + .withChild(ImmutableNodes.newChoiceBuilder() .withNodeIdentifier(new NodeIdentifier(ConfigTarget.QNAME)) .withChild(ImmutableNodes.leafNode(Candidate.QNAME, Empty.value())) .build()) diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java index 0a9ab8412d..fdf2c3bb0a 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java @@ -56,7 +56,7 @@ import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.MountPointContext; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java index df1398fcb5..cb432a8e3d 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java @@ -78,8 +78,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.MountPointContext; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -210,7 +209,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { public void testCreateSubscriberNotificationSchemaNotPresent() throws Exception { final var transformer = new NetconfMessageTransformer(MountPointContext.of(SCHEMA), true, BASE_SCHEMAS.baseSchemaWithNotifications()); - var netconfMessage = transformer.toRpcRequest(CreateSubscription.QNAME, Builders.containerBuilder() + var netconfMessage = transformer.toRpcRequest(CreateSubscription.QNAME, ImmutableNodes.newContainerBuilder() .withNodeIdentifier(new NodeIdentifier(CreateSubscriptionInput.QNAME)) .build()); assertEquals(""" @@ -327,7 +326,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { keys.put(value.name().getNodeType(), value.body()); } - final var schemaNode = Builders.mapEntryBuilder() + final var schemaNode = ImmutableNodes.newMapEntryBuilder() .withNodeIdentifier(NodeIdentifierWithPredicates.of(Schema.QNAME, keys)) .withValue(values) .build(); @@ -412,7 +411,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { keys.put(value.name().getNodeType(), value.body()); } - final var schemaNode = Builders.mapEntryBuilder() + final var schemaNode = ImmutableNodes.newMapEntryBuilder() .withNodeIdentifier(NodeIdentifierWithPredicates.of(Schema.QNAME, keys)) .withValue(values) .build(); @@ -719,7 +718,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); - ContainerNode payload = Builders.containerBuilder() + ContainerNode payload = ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NodeIdentifier.create(QName.create(barInputQname, "input"))) .withChild(ImmutableNodes.leafNode(barInputQname, barInput)) .build(); @@ -1179,14 +1178,14 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { } private static ContainerNode initInputAction(final QName qname, final String value) { - return Builders.containerBuilder() + return ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NodeIdentifier.create(QName.create(qname, "input"))) .withChild(ImmutableNodes.leafNode(qname, value)) .build(); } private static ContainerNode initEmptyInputAction(final QName qname) { - return Builders.containerBuilder() + return ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NodeIdentifier.create(QName.create(qname, "input"))) .build(); } diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessRpcStructureTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessRpcStructureTransformerTest.java index a2ceb77bcc..b17e132d9d 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessRpcStructureTransformerTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessRpcStructureTransformerTest.java @@ -31,7 +31,7 @@ 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.schema.DOMSourceAnyxmlNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.w3c.dom.Document; import org.xml.sax.SAXException; import org.xmlunit.builder.DiffBuilder; @@ -95,7 +95,7 @@ public class SchemalessRpcStructureTransformerTest { @Test public void testCreateEditConfigStructure() throws Exception { - final var data = Builders.anyXmlBuilder() + final var data = ImmutableNodes.newAnyxmlBuilder(DOMSource.class) .withNodeIdentifier(createNodeId(path.getLastPathArgument().getNodeType().getLocalName())) .withValue(source) .build(); @@ -129,7 +129,7 @@ public class SchemalessRpcStructureTransformerTest { @Test public void testSelectFromDataStructure() throws Exception { - final var data = Builders.anyXmlBuilder() + final var data = ImmutableNodes.newAnyxmlBuilder(DOMSource.class) .withNodeIdentifier(createNodeId(path.getLastPathArgument().getNodeType().getLocalName())) .withValue(new DOMSource(XmlUtil.readXmlToDocument(getConfigData).getDocumentElement())) .build(); diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/KeepaliveSalFacadeResponseWaitingTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/KeepaliveSalFacadeResponseWaitingTest.java index a73e74b0df..b7517567bc 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/KeepaliveSalFacadeResponseWaitingTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/KeepaliveSalFacadeResponseWaitingTest.java @@ -37,7 +37,7 @@ import org.opendaylight.netconf.client.mdsal.impl.NetconfMessageTransformUtil; import org.opendaylight.netconf.common.impl.DefaultNetconfTimer; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.GetConfig; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; @ExtendWith(MockitoExtension.class) class KeepaliveSalFacadeResponseWaitingTest { @@ -86,7 +86,7 @@ class KeepaliveSalFacadeResponseWaitingTest { //This settable future will be used to check the invokation of keepalive RPC. Should be never invoked. final var keepaliveSettableFuture = SettableFuture.create(); - keepaliveSettableFuture.set(new DefaultDOMRpcResult(Builders.containerBuilder() + keepaliveSettableFuture.set(new DefaultDOMRpcResult(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NetconfMessageTransformUtil.NETCONF_RUNNING_NODEID) .build())); diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/KeepaliveSalFacadeTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/KeepaliveSalFacadeTest.java index 25e88c05a7..be1849e5f2 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/KeepaliveSalFacadeTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/KeepaliveSalFacadeTest.java @@ -40,7 +40,7 @@ import org.opendaylight.netconf.common.impl.DefaultNetconfTimer; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; @ExtendWith(MockitoExtension.class) class KeepaliveSalFacadeTest { @@ -76,7 +76,7 @@ class KeepaliveSalFacadeTest { @Test void testKeepaliveSuccess() throws Exception { doNothing().when(underlyingSalFacade).onDeviceConnected(isNull(), isNull(), any()); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult(Builders.containerBuilder() + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NetconfMessageTransformUtil.NETCONF_RUNNING_NODEID) .build()))).when(deviceRpc).invokeNetconf(any(), any()); diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java index 70d1e8ce71..6810854c44 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java @@ -48,7 +48,7 @@ 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.MountPointContext; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.w3c.dom.Node; @@ -143,7 +143,8 @@ public class NetconfDeviceRpcTest extends AbstractBaseSchemasTest { } private static ContainerNode createNode(final String namespace, final String date, final String localName) { - return Builders.containerBuilder().withNodeIdentifier( - new NodeIdentifier(QName.create(namespace, date, localName))).build(); + return ImmutableNodes.newContainerBuilder() + .withNodeIdentifier(new NodeIdentifier(QName.create(namespace, date, localName))) + .build(); } } diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceWriteOnlyTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceWriteOnlyTxTest.java index f92bd41906..2b95082f6a 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceWriteOnlyTxTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceWriteOnlyTxTest.java @@ -51,7 +51,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MountPointContext; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class NetconfDeviceWriteOnlyTxTest extends AbstractBaseSchemasTest { @@ -73,7 +73,9 @@ public class NetconfDeviceWriteOnlyTxTest extends AbstractBaseSchemasTest { final var tx = new WriteCandidateTx(ID, new NetconfBaseOps(rpc, mock(MountPointContext.class)), false, true); tx.init(); - final var emptyList = ImmutableNodes.mapNodeBuilder(new NodeIdentifier(Filter.QNAME)).build(); + final var emptyList = ImmutableNodes.newSystemMapBuilder() + .withNodeIdentifier(new NodeIdentifier(Filter.QNAME)) + .build(); tx.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.of(Filter.QNAME), emptyList); tx.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.of(Filter.QNAME), emptyList); diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/TxTestUtils.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/TxTestUtils.java index 4def7eb92e..cff11e56e8 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/TxTestUtils.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/TxTestUtils.java @@ -9,9 +9,10 @@ package org.opendaylight.netconf.client.mdsal.spi; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; public final class TxTestUtils { private static final QName Q_NAME_1 = QName.create("test:namespace", "2013-07-22", "c"); @@ -30,7 +31,7 @@ public final class TxTestUtils { } static ContainerNode getContainerNode() { - return ImmutableNodes.containerNode(Q_NAME_1); + return ImmutableNodes.newContainerBuilder().withNodeIdentifier(new NodeIdentifier(Q_NAME_1)).build(); } public static LeafNode getLeafNode() { diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/WriteCandidateRunningTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/WriteCandidateRunningTxTest.java index 0b6cc592f0..4e82a32887 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/WriteCandidateRunningTxTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/WriteCandidateRunningTxTest.java @@ -39,8 +39,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MountPointContext; -import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class WriteCandidateRunningTxTest extends AbstractTestModelTest { @@ -84,11 +83,11 @@ public class WriteCandidateRunningTxTest extends AbstractTestModelTest { } private static ContainerNode getLockContent(final QName op, final NodeIdentifier datastore) { - return Builders.containerBuilder() + return ImmutableNodes.newContainerBuilder() .withNodeIdentifier(toId(op)) - .withChild(Builders.containerBuilder() + .withChild(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(NETCONF_TARGET_NODEID) - .withChild(Builders.choiceBuilder() + .withChild(ImmutableNodes.newChoiceBuilder() .withNodeIdentifier(toId(ConfigTarget.QNAME)) .withChild(ImmutableNodes.leafNode(datastore, Empty.value())) .build()) -- 2.36.6