From b0441fda6b0f5efbc7c45f19e26ce23e2974d1ea Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 3 Nov 2022 02:24:02 +0100 Subject: [PATCH 1/1] Do not reference individual builders We are about to hide individual builders, make sure we go through either Builders or ImmutableNodes. Change-Id: I9ece3328ffe148e09e5e232e79cc8db24214161b Signed-off-by: Robert Varga --- .../mdsal/connector/ops/RuntimeRpcTest.java | 15 +++---- .../singleton/impl/NetconfNodeActorTest.java | 16 +++---- .../sal/NetconfDeviceTopologyAdapterTest.java | 6 +-- ...onfRemoteSchemaYangSourceProviderTest.java | 7 ++- .../NetconfMessageTransformerTest.java | 13 +++--- .../RestconfDocumentedExceptionMapper.java | 20 ++++----- .../rests/services/impl/CreateStreamUtil.java | 10 ++--- .../restconf/nb/rfc8040/TestUtils.java | 43 +++++++------------ ...areNormalizedNodeWriterParametersTest.java | 9 ++-- .../impl/RestconfDataServiceImplTest.java | 9 ++-- 10 files changed, 63 insertions(+), 85 deletions(-) diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java index 146be0ab4d..a3019a0fa3 100644 --- a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java +++ b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java @@ -54,15 +54,14 @@ import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.QName; 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.ContainerNode; 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.builder.impl.ImmutableContainerNodeBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.OutputSchemaNode; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; @@ -122,10 +121,10 @@ public class RuntimeRpcTest { .findFirst().orElse(null); final RpcDefinition rpcDefinition = getRpcDefinitionFromModule(module, module.getNamespace(), type.getLocalName()); - final OutputSchemaNode outputSchemaNode = rpcDefinition.getOutput(); - final ContainerNode node = ImmutableContainerNodeBuilder.create() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(outputSchemaNode.getQName())) - .withValue(children).build(); + final ContainerNode node = Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(rpcDefinition.getOutput().getQName())) + .withValue(children) + .build(); return immediateFluentFuture(new DefaultDOMRpcResult(node)); } @@ -176,7 +175,7 @@ public class RuntimeRpcTest { return immediateFluentFuture(yangTextSchemaSource); }).when(sourceProvider).getSource(any(SourceIdentifier.class)); - this.currentSchemaContext = CurrentSchemaContext.create(schemaService, sourceProvider); + currentSchemaContext = CurrentSchemaContext.create(schemaService, sourceProvider); } @After diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java index 8952dfd449..c630197ccb 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java @@ -107,11 +107,10 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; 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.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.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; @@ -489,8 +488,8 @@ public class NetconfNodeActorTest extends AbstractBaseSchemasTest { assertTrue(slaveDomRPCService instanceof ProxyDOMRpcService); final QName testQName = QName.create("", "TestQname"); - final NormalizedNode outputNode = ImmutableContainerNodeBuilder.create() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(testQName)) + final ContainerNode outputNode = Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(testQName)) .withChild(ImmutableNodes.leafNode(testQName, "foo")).build(); final RpcError rpcError = RpcResultBuilder.newError(ErrorType.RPC, null, "Rpc invocation failed."); @@ -558,14 +557,13 @@ public class NetconfNodeActorTest extends AbstractBaseSchemasTest { final QName testQName = QName.create("test", "2019-08-16", "TestActionQname"); final Absolute schemaPath = Absolute.of(testQName); - final YangInstanceIdentifier yangIIdPath = YangInstanceIdentifier - .create(new YangInstanceIdentifier.NodeIdentifier(testQName)); + final YangInstanceIdentifier yangIIdPath = YangInstanceIdentifier.create(new NodeIdentifier(testQName)); final DOMDataTreeIdentifier domDataTreeIdentifier = new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, yangIIdPath); - final ContainerNode outputNode = ImmutableContainerNodeBuilder.create() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(testQName)) + final ContainerNode outputNode = Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(testQName)) .withChild(ImmutableNodes.leafNode(testQName, "foo")).build(); // Action with no response output. @@ -635,7 +633,7 @@ public class NetconfNodeActorTest extends AbstractBaseSchemasTest { final YangInstanceIdentifier PATH = YangInstanceIdentifier.empty(); final LogicalDatastoreType STORE = LogicalDatastoreType.CONFIGURATION; final ContainerNode NODE = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create("", "cont"))) + .withNodeIdentifier(new NodeIdentifier(QName.create("", "cont"))) .build(); final FluentFuture> result = immediateFluentFuture(Optional.of(NODE)); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceTopologyAdapterTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceTopologyAdapterTest.java index 8bb3f8d437..acda4224d1 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceTopologyAdapterTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceTopologyAdapterTest.java @@ -49,8 +49,9 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class NetconfDeviceTopologyAdapterTest { @@ -166,8 +167,7 @@ public class NetconfDeviceTopologyAdapterTest { .nodeWithKey(Node.QNAME, QName.create(Node.QNAME, "node-id"), "test") .node(netconfTestLeafQname).build(); - NormalizedNode augmentNode = ImmutableLeafNodeBuilder.create().withValue(dataTestId) - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(netconfTestLeafQname)).build(); + LeafNode augmentNode = ImmutableNodes.leafNode(netconfTestLeafQname, dataTestId); DOMDataTreeWriteTransaction wtx = domDataBroker.newWriteOnlyTransaction(); wtx.put(LogicalDatastoreType.OPERATIONAL, pathToAugmentedLeaf, augmentNode); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java index 3a178a446e..d1bb07de82 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProviderTest.java @@ -33,8 +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.builder.impl.ImmutableAnyXmlNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.w3c.dom.Document; @@ -77,9 +76,9 @@ public class NetconfRemoteSchemaYangSourceProviderTest { Document xmlDoc = UntrustedXML.newDocumentBuilder().newDocument(); Element root = xmlDoc.createElement("data"); root.setTextContent("module test {}"); - return ImmutableContainerNodeBuilder.create() + return Builders.containerBuilder() .withNodeIdentifier(id) - .withChild(ImmutableAnyXmlNodeBuilder.create() + .withChild(Builders.anyXmlBuilder() .withNodeIdentifier(childId) .withValue(new DOMSource(root)) .build()) diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java index 0ed3a9286f..533c31f6e0 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java @@ -93,7 +93,6 @@ 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.impl.schema.NormalizedNodeResult; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; 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; @@ -726,10 +725,10 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); - ContainerNode payload = ImmutableContainerNodeBuilder.create() - .withNodeIdentifier(NodeIdentifier.create(QName.create(barInputQname, "input"))) - .withChild(ImmutableNodes.leafNode(barInputQname, barInput)) - .build(); + ContainerNode payload = Builders.containerBuilder() + .withNodeIdentifier(NodeIdentifier.create(QName.create(barInputQname, "input"))) + .withChild(ImmutableNodes.leafNode(barInputQname, barInput)) + .build(); NetconfMessage actionRequest = actionNetconfMessageTransformer.toActionRequest( XYZZY_BAR_PATH, domDataTreeIdentifier, payload); @@ -1170,14 +1169,14 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { } private static ContainerNode initInputAction(final QName qname, final String value) { - return ImmutableContainerNodeBuilder.create() + return Builders.containerBuilder() .withNodeIdentifier(NodeIdentifier.create(QName.create(qname, "input"))) .withChild(ImmutableNodes.leafNode(qname, value)) .build(); } private static ContainerNode initEmptyInputAction(final QName qname) { - return ImmutableContainerNodeBuilder.create() + return Builders.containerBuilder() .withNodeIdentifier(NodeIdentifier.create(QName.create(qname, "input"))) .build(); } diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java index ebc7c5eda6..8b94593e5f 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java @@ -42,12 +42,9 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent 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.UnkeyedListEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; +import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUnkeyedListEntryNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUnkeyedListNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -123,9 +120,9 @@ public final class RestconfDocumentedExceptionMapper implements ExceptionMapper< * @return Built errors container. */ private static ContainerNode buildErrorsContainer(final RestconfDocumentedException exception) { - return ImmutableContainerNodeBuilder.create() + return Builders.containerBuilder() .withNodeIdentifier(NodeIdentifier.create(Errors.QNAME)) - .withChild(ImmutableUnkeyedListNodeBuilder.create() + .withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(NodeIdentifier.create(Error.QNAME)) .withValue(exception.getErrors().stream() .map(RestconfDocumentedExceptionMapper::createErrorEntry) @@ -142,11 +139,10 @@ public final class RestconfDocumentedExceptionMapper implements ExceptionMapper< */ private static UnkeyedListEntryNode createErrorEntry(final RestconfError restconfError) { // filling in mandatory leafs - final DataContainerNodeBuilder entryBuilder = - ImmutableUnkeyedListEntryNodeBuilder.create() - .withNodeIdentifier(NodeIdentifier.create(Error.QNAME)) - .withChild(ImmutableNodes.leafNode(ERROR_TYPE_QNAME, restconfError.getErrorType().elementBody())) - .withChild(ImmutableNodes.leafNode(ERROR_TAG_QNAME, restconfError.getErrorTag().elementBody())); + final var entryBuilder = Builders.unkeyedListEntryBuilder() + .withNodeIdentifier(NodeIdentifier.create(Error.QNAME)) + .withChild(ImmutableNodes.leafNode(ERROR_TYPE_QNAME, restconfError.getErrorType().elementBody())) + .withChild(ImmutableNodes.leafNode(ERROR_TAG_QNAME, restconfError.getErrorTag().elementBody())); // filling in optional fields if (restconfError.getErrorMessage() != null) { @@ -366,6 +362,6 @@ public final class RestconfDocumentedExceptionMapper implements ExceptionMapper< */ @VisibleForTesting void setHttpHeaders(final HttpHeaders httpHeaders) { - this.headers = httpHeaders; + headers = httpHeaders; } } diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java index 487d406c0b..11bc447fad 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtil.java @@ -35,8 +35,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; 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.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; @@ -117,10 +117,10 @@ final class CreateStreamUtil { final QName outputQname = QName.create(qname, "output"); final QName streamNameQname = QName.create(qname, "stream-name"); - final ContainerNode output = ImmutableContainerNodeBuilder.create() - .withNodeIdentifier(new NodeIdentifier(outputQname)) - .withChild(ImmutableNodes.leafNode(streamNameQname, streamName)).build(); - return new DefaultDOMRpcResult(output); + return new DefaultDOMRpcResult(Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(outputQname)) + .withChild(ImmutableNodes.leafNode(streamNameQname, streamName)) + .build()); } /** diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java index 3829ad0ac1..1fe3692b49 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java @@ -48,10 +48,8 @@ import org.opendaylight.yangtools.yang.common.XMLNamespace; 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.MapEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapEntryNodeBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; @@ -236,32 +234,21 @@ public final class TestUtils { return NodeIdentifierWithPredicates.of(QName.create(namespace, revision, localName), predicate); } - public static NormalizedNode prepareNormalizedNodeWithIetfInterfacesInterfacesData() throws ParseException { + public static MapEntryNode prepareNormalizedNodeWithIetfInterfacesInterfacesData() throws ParseException { final String ietfInterfacesDate = "2013-07-04"; final String namespace = "urn:ietf:params:xml:ns:yang:ietf-interfaces"; - final DataContainerNodeBuilder mapEntryNode = - ImmutableMapEntryNodeBuilder.create(); - - final Map predicates = new HashMap<>(); - predicates.put("name", "eth0"); - - mapEntryNode.withNodeIdentifier(getNodeIdentifierPredicate("interface", namespace, ietfInterfacesDate, - predicates)); - mapEntryNode - .withChild(new ImmutableLeafNodeBuilder() - .withNodeIdentifier(getNodeIdentifier("name", namespace, ietfInterfacesDate)).withValue("eth0") - .build()); - mapEntryNode.withChild(new ImmutableLeafNodeBuilder() - .withNodeIdentifier(getNodeIdentifier("type", namespace, ietfInterfacesDate)) - .withValue("ethernetCsmacd").build()); - mapEntryNode.withChild(new ImmutableLeafNodeBuilder() - .withNodeIdentifier(getNodeIdentifier("enabled", namespace, ietfInterfacesDate)) - .withValue(Boolean.FALSE).build()); - mapEntryNode.withChild(new ImmutableLeafNodeBuilder() - .withNodeIdentifier(getNodeIdentifier("description", namespace, ietfInterfacesDate)) - .withValue("some interface").build()); - - return mapEntryNode.build(); + + return Builders.mapEntryBuilder() + .withNodeIdentifier(getNodeIdentifierPredicate("interface", namespace, ietfInterfacesDate, + Map.of("name", "eth0"))) + .withChild(ImmutableNodes.leafNode(getNodeIdentifier("name", namespace, ietfInterfacesDate), "eth0")) + .withChild(ImmutableNodes.leafNode(getNodeIdentifier("type", namespace, ietfInterfacesDate), + "ethernetCsmacd")) + .withChild(ImmutableNodes.leafNode(getNodeIdentifier("enabled", namespace, ietfInterfacesDate), + Boolean.FALSE)) + .withChild(ImmutableNodes.leafNode(getNodeIdentifier("description", namespace, ietfInterfacesDate), + "some interface")) + .build(); } public static SchemaContextHandler newSchemaContextHandler(final EffectiveModelContext schemaContext) { diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterParametersTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterParametersTest.java index a60c07d224..bd964e8afa 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterParametersTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterParametersTest.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.SystemLeafSetNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** @@ -136,9 +136,10 @@ public class ParameterAwareNormalizedNodeWriterParametersTest { @Test public void writeEmptyRootContainerTest() throws Exception { final ParameterAwareNormalizedNodeWriter parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( - writer, null, null); + writer, null, null); - parameterWriter.write(ImmutableContainerNodeBuilder.create() - .withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)).build()); + parameterWriter.write(Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)) + .build()); } } \ No newline at end of file diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java index 6d54541f6d..61897a1b16 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java @@ -80,7 +80,6 @@ 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.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -245,10 +244,10 @@ public class RestconfDataServiceImplTest { } private static ContainerNode wrapNodeByDataRootContainer(final DataContainerChild data) { - return ImmutableContainerNodeBuilder.create() - .withNodeIdentifier(NodeIdentifier.create(SchemaContext.NAME)) - .withChild(data) - .build(); + return Builders.containerBuilder() + .withNodeIdentifier(NodeIdentifier.create(SchemaContext.NAME)) + .withChild(data) + .build(); } /** -- 2.36.6