From 982e75ece2483e413befe3edd8fd90022a644f72 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 5 Apr 2019 23:38:53 +0200 Subject: [PATCH] Reduce the use of AttrBuilders NormalizedNode*AttrBuilders are going away, remove them from where they are not necessary. Change-Id: I72cb68e6565f9c05864e1c465d5db7611e5a9c02 Signed-off-by: Robert Varga (cherry picked from commit 682d341bba757ccc88436a635c19d5c7dec86c81) --- .../netconf/NetconfEventSourceTest.java | 4 +-- ...NetconfRemoteSchemaYangSourceProvider.java | 4 +-- .../connect/netconf/util/NetconfBaseOps.java | 4 +-- .../netconf/NetconfToRpcRequestTest.java | 4 +-- .../RestconfDocumentedExceptionMapper.java | 7 ++-- .../sal/restconf/impl/BrokerFacade.java | 22 ++++++------ .../restconf/impl/NormalizedDataPrunner.java | 11 +++--- .../sal/restconf/impl/RestconfImpl.java | 18 +++++----- .../to/cnsn/test/RestPutListDataTest.java | 11 +++--- .../test/NnInstanceIdentifierToXmlTest.java | 12 +++---- .../impl/nn/to/xml/test/NnToXmlTest.java | 12 +++---- .../nn/to/xml/test/NnToXmlWithChoiceTest.java | 3 +- ...NnToXmlWithDataFromSeveralModulesTest.java | 14 ++++---- .../impl/test/CutDataToCorrectDepthTest.java | 8 ++--- .../impl/test/InvokeRpcMethodTest.java | 14 ++++---- .../sal/restconf/impl/test/TestUtils.java | 4 +-- .../impl/test/URIParametersParsing.java | 3 +- ...estconfStreamsSubscriptionServiceImpl.java | 4 +-- .../rests/utils/ReadDataTransactionUtil.java | 25 +++++++------ .../impl/RestconfOperationsServiceImpl.java | 4 +-- .../mapping/RestconfMappingNodeUtil.java | 36 +++++++++---------- .../restconf/nb/rfc8040/TestUtils.java | 4 +-- .../rests/utils/CreateStreamUtilTest.java | 4 +-- 23 files changed, 112 insertions(+), 120 deletions(-) diff --git a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceTest.java b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceTest.java index 5220248969..61287c6f21 100644 --- a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceTest.java +++ b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceTest.java @@ -46,7 +46,7 @@ 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.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @@ -76,7 +76,7 @@ public class NetconfEventSourceTest { //init notification mocks doReturn(NOTIFICATION_1_PATH).when(matchnigNotification).getType(); doReturn(NOTIFICATION_2_PATH).when(nonMachtingNotification).getType(); - DataContainerNodeAttrBuilder body = Builders + DataContainerNodeBuilder body = Builders .containerBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create("ns1", "1970-01-15", "not1data"))); doReturn(body.build()).when(matchnigNotification).getBody(); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java index 4098eed230..3ffc556abd 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java @@ -34,7 +34,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.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; @@ -70,7 +70,7 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource public static ContainerNode createGetSchemaRequest(final String moduleName, final Optional revision) { final LeafNode identifier = Builders.leafBuilder().withNodeIdentifier(IDENTIFIER_PATHARG).withValue(moduleName).build(); - final DataContainerNodeAttrBuilder builder = Builders.containerBuilder() + final DataContainerNodeBuilder builder = Builders.containerBuilder() .withNodeIdentifier(GET_SCHEMA_PATHARG).withChild(identifier).withChild(FORMAT_LEAF); if (revision.isPresent()) { diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java index 391c8921e0..88b4526070 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java @@ -54,7 +54,7 @@ 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.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** @@ -296,7 +296,7 @@ public final class NetconfBaseOps { private static ContainerNode getEditConfigContent( final QName datastore, final DataContainerChild editStructure, final Optional defaultOperation, final boolean rollback) { - final DataContainerNodeAttrBuilder editBuilder = + final DataContainerNodeBuilder editBuilder = Builders.containerBuilder().withNodeIdentifier(NETCONF_EDIT_CONFIG_NODEID); // Target diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java index 2e5ef1c410..0e0b8dee74 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/NetconfToRpcRequestTest.java @@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; 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.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -68,7 +68,7 @@ public class NetconfToRpcRequestTest { @Test public void testUserDefinedRpcCall() throws Exception { - final DataContainerNodeAttrBuilder rootBuilder = + final DataContainerNodeBuilder rootBuilder = Builders.containerBuilder(); rootBuilder.withNodeIdentifier(toId(SUBSCRIBE_RPC_NAME)); diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java index a858efbd29..5561949f5e 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.sal.rest.impl; import com.google.common.base.Preconditions; @@ -55,7 +54,7 @@ import org.opendaylight.yangtools.yang.data.codec.xml.XMLStreamNormalizedNodeStr 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.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -129,7 +128,7 @@ public class RestconfDocumentedExceptionMapper implements ExceptionMapper errContBuild = + final DataContainerNodeBuilder errContBuild = Builders.containerBuilder((ContainerSchemaNode) errorsSchemaNode); final List schemaList = ControllerContext.findInstanceDataChildrenByName(errorsSchemaNode, @@ -163,7 +162,7 @@ public class RestconfDocumentedExceptionMapper implements ExceptionMapper errNodeValues = Builders + final DataContainerNodeBuilder errNodeValues = Builders .mapEntryBuilder(listStreamSchemaNode); List lsChildDataSchemaNode = ControllerContext.findInstanceDataChildrenByName( diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java index 3794ac503d..689f201536 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java @@ -73,8 +73,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.OrderedMapNode; 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.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextNode; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -541,13 +541,13 @@ public class BrokerFacade implements Closeable { final DataSchemaContextTree baseSchemaCtxTree = DataSchemaContextTree.from(ctx); final DataSchemaNode baseSchemaNode = baseSchemaCtxTree.getChild(path).getDataSchemaNode(); if (result instanceof ContainerNode) { - final DataContainerNodeAttrBuilder builder = + final DataContainerNodeBuilder builder = Builders.containerBuilder((ContainerSchemaNode) baseSchemaNode); buildCont(builder, (ContainerNode) result, baseSchemaCtxTree, path, trim); return builder.build(); } - final DataContainerNodeAttrBuilder builder = + final DataContainerNodeBuilder builder = Builders.mapEntryBuilder((ListSchemaNode) baseSchemaNode); buildMapEntryBuilder(builder, (MapEntryNode) result, baseSchemaCtxTree, path, trim, ((ListSchemaNode) baseSchemaNode).getKeyDefinition()); @@ -555,14 +555,14 @@ public class BrokerFacade implements Closeable { } private void buildMapEntryBuilder( - final DataContainerNodeAttrBuilder builder, + final DataContainerNodeBuilder builder, final MapEntryNode result, final DataSchemaContextTree baseSchemaCtxTree, final YangInstanceIdentifier actualPath, final boolean trim, final List keys) { for (final DataContainerChild child : result.getValue()) { final YangInstanceIdentifier path = actualPath.node(child.getIdentifier()); final DataSchemaNode childSchema = baseSchemaCtxTree.getChild(path).getDataSchemaNode(); if (child instanceof ContainerNode) { - final DataContainerNodeAttrBuilder childBuilder = + final DataContainerNodeBuilder childBuilder = Builders.containerBuilder((ContainerSchemaNode) childSchema); buildCont(childBuilder, (ContainerNode) child, baseSchemaCtxTree, path, trim); builder.withChild(childBuilder.build()); @@ -575,7 +575,7 @@ public class BrokerFacade implements Closeable { } else if (child instanceof LeafNode) { final Object defaultVal = ((LeafSchemaNode) childSchema).getType().getDefaultValue().orElse(null); final Object nodeVal = child.getValue(); - final NormalizedNodeAttrBuilder> leafBuilder = + final NormalizedNodeBuilder> leafBuilder = Builders.leafBuilder((LeafSchemaNode) childSchema); if (keys.contains(child.getNodeType())) { leafBuilder.withValue(child.getValue()); @@ -603,21 +603,21 @@ public class BrokerFacade implements Closeable { for (final MapEntryNode mapEntryNode : result.getValue()) { final YangInstanceIdentifier actualNode = path.node(mapEntryNode.getIdentifier()); final DataSchemaNode childSchema = baseSchemaCtxTree.getChild(actualNode).getDataSchemaNode(); - final DataContainerNodeAttrBuilder mapEntryBuilder = + final DataContainerNodeBuilder mapEntryBuilder = Builders.mapEntryBuilder((ListSchemaNode) childSchema); buildMapEntryBuilder(mapEntryBuilder, mapEntryNode, baseSchemaCtxTree, actualNode, trim, keys); builder.withChild(mapEntryBuilder.build()); } } - private void buildCont(final DataContainerNodeAttrBuilder builder, + private void buildCont(final DataContainerNodeBuilder builder, final ContainerNode result, final DataSchemaContextTree baseSchemaCtxTree, final YangInstanceIdentifier actualPath, final boolean trim) { for (final DataContainerChild child : result.getValue()) { final YangInstanceIdentifier path = actualPath.node(child.getIdentifier()); final DataSchemaNode childSchema = baseSchemaCtxTree.getChild(path).getDataSchemaNode(); if (child instanceof ContainerNode) { - final DataContainerNodeAttrBuilder builderChild = + final DataContainerNodeBuilder builderChild = Builders.containerBuilder((ContainerSchemaNode) childSchema); buildCont(builderChild, result, baseSchemaCtxTree, actualPath, trim); builder.withChild(builderChild.build()); @@ -630,7 +630,7 @@ public class BrokerFacade implements Closeable { } else if (child instanceof LeafNode) { final Object defaultVal = ((LeafSchemaNode) childSchema).getType().getDefaultValue().orElse(null); final Object nodeVal = child.getValue(); - final NormalizedNodeAttrBuilder> leafBuilder = + final NormalizedNodeBuilder> leafBuilder = Builders.leafBuilder((LeafSchemaNode) childSchema); if (trim) { if (defaultVal == null || !defaultVal.equals(nodeVal)) { diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedDataPrunner.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedDataPrunner.java index 86faf787ba..27b994aa38 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedDataPrunner.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/NormalizedDataPrunner.java @@ -30,7 +30,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; 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.builder.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; class NormalizedDataPrunner { @@ -68,7 +67,7 @@ class NormalizedDataPrunner { private DataContainerChild processContainerNode(final NormalizedNode node, final Integer depth) { final ContainerNode containerNode = (ContainerNode) node; - DataContainerNodeAttrBuilder newContainerBuilder = Builders.containerBuilder() + DataContainerNodeBuilder newContainerBuilder = Builders.containerBuilder() .withNodeIdentifier(containerNode.getIdentifier()); if (depth > 1) { processDataContainerChild((DataContainerNode) node, depth, newContainerBuilder); @@ -113,7 +112,7 @@ class NormalizedDataPrunner { .unkeyedListBuilder(); if (depth > 1) { for (UnkeyedListEntryNode oldUnkeyedListEntry : ((UnkeyedListNode) node).getValue()) { - DataContainerNodeAttrBuilder newUnkeyedListEntry = Builders + DataContainerNodeBuilder newUnkeyedListEntry = Builders .unkeyedListEntryBuilder().withNodeIdentifier(oldUnkeyedListEntry.getIdentifier()); for (DataContainerChild oldUnkeyedListEntryValue : oldUnkeyedListEntry .getValue()) { @@ -138,10 +137,10 @@ class NormalizedDataPrunner { } private void processMapEntries(final NormalizedNode node, final Integer depth, - CollectionNodeBuilder newOrderedMapNodeBuilder) { + final CollectionNodeBuilder newOrderedMapNodeBuilder) { if (depth > 1) { for (MapEntryNode oldMapEntryNode : ((MapNode) node).getValue()) { - DataContainerNodeAttrBuilder newMapEntryNodeBuilder = + DataContainerNodeBuilder newMapEntryNodeBuilder = Builders.mapEntryBuilder().withNodeIdentifier(oldMapEntryNode.getIdentifier()); for (DataContainerChild mapEntryNodeValue : oldMapEntryNode.getValue()) { newMapEntryNodeBuilder.withChild(pruneDataAtDepth(mapEntryNodeValue, depth - 1)); @@ -150,6 +149,4 @@ class NormalizedDataPrunner { } } } - - } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java index b2d9f541a6..fe3548dcb7 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java @@ -95,9 +95,9 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.ModifiedNodeDoesNotE 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.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -196,7 +196,7 @@ public final class RestconfImpl implements RestconfService { restconfModule, Draft02.RestConfModule.MODULES_CONTAINER_SCHEMA_NODE); Preconditions.checkState(modulesSchemaNode instanceof ContainerSchemaNode); - final DataContainerNodeAttrBuilder moduleContainerBuilder = + final DataContainerNodeBuilder moduleContainerBuilder = Builders.containerBuilder((ContainerSchemaNode) modulesSchemaNode); moduleContainerBuilder.withChild(allModuleMap); @@ -228,7 +228,7 @@ public final class RestconfImpl implements RestconfService { restconfModule, Draft02.RestConfModule.MODULES_CONTAINER_SCHEMA_NODE); Preconditions.checkState(modulesSchemaNode instanceof ContainerSchemaNode); - final DataContainerNodeAttrBuilder moduleContainerBuilder = + final DataContainerNodeBuilder moduleContainerBuilder = Builders.containerBuilder((ContainerSchemaNode) modulesSchemaNode); moduleContainerBuilder.withChild(mountPointModulesMap); @@ -296,7 +296,7 @@ public final class RestconfImpl implements RestconfService { restconfModule, Draft02.RestConfModule.STREAMS_CONTAINER_SCHEMA_NODE); Preconditions.checkState(streamsContainerSchemaNode instanceof ContainerSchemaNode); - final DataContainerNodeAttrBuilder streamsContainerBuilder = + final DataContainerNodeBuilder streamsContainerBuilder = Builders.containerBuilder((ContainerSchemaNode) streamsContainerSchemaNode); streamsContainerBuilder.withChild(listStreamsBuilder.build()); @@ -360,7 +360,7 @@ public final class RestconfImpl implements RestconfService { } final ContainerSchemaNode fakeCont = new FakeContainerSchemaNode(fakeRpcSchema); - final DataContainerNodeAttrBuilder containerBuilder = + final DataContainerNodeBuilder containerBuilder = Builders.containerBuilder(fakeCont); for (final LeafSchemaNode leaf : fakeRpcSchema) { @@ -1124,7 +1124,7 @@ public final class RestconfImpl implements RestconfService { if (response != null) { // prepare node with value of location final InstanceIdentifierContext iid = prepareIIDSubsStreamOutput(); - final NormalizedNodeAttrBuilder> builder = + final NormalizedNodeBuilder> builder = ImmutableLeafNodeBuilder.create().withValue(response.toString()); builder.withNodeIdentifier( NodeIdentifier.create(QName.create("subscribe:to:notification", "2016-10-28", "location"))); @@ -1403,7 +1403,7 @@ public final class RestconfImpl implements RestconfService { Preconditions.checkArgument(moduleSchemaNode instanceof ListSchemaNode, "moduleSchemaNode has to be of type ListSchemaNode"); final ListSchemaNode listModuleSchemaNode = (ListSchemaNode) moduleSchemaNode; - final DataContainerNodeAttrBuilder moduleNodeValues = + final DataContainerNodeBuilder moduleNodeValues = Builders.mapEntryBuilder(listModuleSchemaNode); List instanceDataChildrenByName = @@ -1449,7 +1449,7 @@ public final class RestconfImpl implements RestconfService { Preconditions.checkArgument(streamSchemaNode instanceof ListSchemaNode, "streamSchemaNode has to be of type ListSchemaNode"); final ListSchemaNode listStreamSchemaNode = (ListSchemaNode) streamSchemaNode; - final DataContainerNodeAttrBuilder streamNodeValues = + final DataContainerNodeBuilder streamNodeValues = Builders.mapEntryBuilder(listStreamSchemaNode); List instanceDataChildrenByName = diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java index e10c2295a7..90d917335d 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java @@ -45,8 +45,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; 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.builder.api.DataContainerNodeAttrBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.valid.DataValidationException; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -174,7 +174,7 @@ public class RestPutListDataTest { final DataSchemaNode testNodeSchemaNode = schemaContextTestModule.getDataChildByName(lstWithCompositeKey); assertTrue(testNodeSchemaNode != null); assertTrue(testNodeSchemaNode instanceof ListSchemaNode); - final DataContainerNodeAttrBuilder testNodeContainer = + final DataContainerNodeBuilder testNodeContainer = Builders.mapEntryBuilder((ListSchemaNode) testNodeSchemaNode); List testChildren = ControllerContext.findInstanceDataChildrenByName( @@ -183,7 +183,7 @@ public class RestPutListDataTest { final DataSchemaNode testLeafKey1SchemaNode = Iterables.getFirst(testChildren, null); assertTrue(testLeafKey1SchemaNode != null); assertTrue(testLeafKey1SchemaNode instanceof LeafSchemaNode); - final NormalizedNodeAttrBuilder> leafKey1 = + final NormalizedNodeBuilder> leafKey1 = Builders.leafBuilder((LeafSchemaNode) testLeafKey1SchemaNode); leafKey1.withValue(payloadKey1); testNodeContainer.withChild(leafKey1.build()); @@ -195,7 +195,7 @@ public class RestPutListDataTest { final DataSchemaNode testLeafKey2SchemaNode = Iterables.getFirst(testChildren, null); assertTrue(testLeafKey2SchemaNode != null); assertTrue(testLeafKey2SchemaNode instanceof LeafSchemaNode); - final NormalizedNodeAttrBuilder> leafKey2 = + final NormalizedNodeBuilder> leafKey2 = Builders.leafBuilder((LeafSchemaNode) testLeafKey2SchemaNode); leafKey2.withValue(payloadKey2); testNodeContainer.withChild(leafKey2.build()); @@ -222,5 +222,4 @@ public class RestPutListDataTest { } return uriBuilder.toString(); } - } diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java index b6c6ec3207..5c6e629508 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java @@ -33,7 +33,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -108,13 +108,13 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest { final DataSchemaNode schemaCont = schemaContext.getDataChildByName(cont); - final DataContainerNodeAttrBuilder dataCont = Builders + final DataContainerNodeBuilder dataCont = Builders .containerBuilder((ContainerSchemaNode) schemaCont); final DataSchemaNode schemaCont1 = ((ContainerSchemaNode) schemaCont) .getDataChildByName(cont1); - final DataContainerNodeAttrBuilder dataCont1 = Builders + final DataContainerNodeBuilder dataCont1 = Builders .containerBuilder((ContainerSchemaNode) schemaCont1); final List instanceLfLst11 = ControllerContext @@ -206,13 +206,13 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest { final DataSchemaNode schemaCont = schemaContext.getDataChildByName(cont); - final DataContainerNodeAttrBuilder dataCont = Builders + final DataContainerNodeBuilder dataCont = Builders .containerBuilder((ContainerSchemaNode) schemaCont); final DataSchemaNode schemaCont1 = ((ContainerSchemaNode) schemaCont) .getDataChildByName(cont1); - final DataContainerNodeAttrBuilder dataCont1 = Builders + final DataContainerNodeBuilder dataCont1 = Builders .containerBuilder((ContainerSchemaNode) schemaCont1); final List instanceLst11 = ControllerContext @@ -223,7 +223,7 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest { final CollectionNodeBuilder dataLst11 = Builders .mapBuilder((ListSchemaNode) lst11Schema); - final DataContainerNodeAttrBuilder dataLst11Vaule = Builders + final DataContainerNodeBuilder dataLst11Vaule = Builders .mapEntryBuilder((ListSchemaNode) lst11Schema); dataLst11Vaule.withChild(buildLeaf(lst11Schema, keyvalue111, dataLst11, diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java index 01d3d8e63b..1e2ca7aab0 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodec; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -293,7 +293,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest { final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont); - final DataContainerNodeAttrBuilder contData = Builders + final DataContainerNodeBuilder contData = Builders .containerBuilder((ContainerSchemaNode) contSchema); final List instanceLf = ControllerContext @@ -325,7 +325,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest { final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont); - final DataContainerNodeAttrBuilder contData = Builders + final DataContainerNodeBuilder contData = Builders .containerBuilder((ContainerSchemaNode) contSchema); List instanceLf = ControllerContext @@ -351,7 +351,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest { final QName lfLfref = QName.create("basic:module", "2013-12-02", "lfLfrefNegative"); final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont); - final DataContainerNodeAttrBuilder contData = Builders + final DataContainerNodeBuilder contData = Builders .containerBuilder((ContainerSchemaNode) contSchema); final List instanceLf = ControllerContext.findInstanceDataChildrenByName((DataNodeContainer) @@ -371,12 +371,12 @@ public class NnToXmlTest extends AbstractBodyReaderTest { final DataSchemaNode contSchema = schemaContext.getDataChildByName(cont); - final DataContainerNodeAttrBuilder contData = Builders + final DataContainerNodeBuilder contData = Builders .containerBuilder((ContainerSchemaNode) contSchema); final DataSchemaNode cont1Schema = ((ContainerSchemaNode) contSchema).getDataChildByName(cont1); - final DataContainerNodeAttrBuilder cont1Data = Builders + final DataContainerNodeBuilder cont1Data = Builders .containerBuilder((ContainerSchemaNode) cont1Schema); Object value = null; diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java index 6fbb4683e5..58581acca2 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java @@ -26,7 +26,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -76,7 +75,7 @@ public class NnToXmlWithChoiceTest extends AbstractBodyReaderTest { final DataSchemaNode contSchemaNode = schemaContext .getDataChildByName(contQname); - final DataContainerNodeAttrBuilder dataContainerNodeAttrBuilder = Builders + final DataContainerNodeBuilder dataContainerNodeAttrBuilder = Builders .containerBuilder((ContainerSchemaNode) contSchemaNode); final DataSchemaNode choiceSchemaNode = ((ContainerSchemaNode) contSchemaNode) diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java index 1f4b0456d8..b61dae3bff 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java @@ -29,7 +29,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.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -98,15 +98,15 @@ public class NnToXmlWithDataFromSeveralModulesTest extends assertTrue(schemaContNode instanceof ContainerSchemaNode); - final DataContainerNodeAttrBuilder dataContSchemaContNode = Builders + final DataContainerNodeBuilder dataContSchemaContNode = Builders .containerBuilder((ContainerSchemaNode) schemaContNode); - final DataContainerNodeAttrBuilder modul1 = buildContBuilderMod1( + final DataContainerNodeBuilder modul1 = buildContBuilderMod1( "module:one", rev, "cont_m1", "contB_m1", "lf1_m1", "lf1 m1 value"); dataContSchemaContNode.withChild(modul1.build()); - final DataContainerNodeAttrBuilder modul2 = buildContBuilderMod1( + final DataContainerNodeBuilder modul2 = buildContBuilderMod1( "module:two", rev, "cont_m2", "contB_m2", "lf1_m2", "lf1 m2 value"); dataContSchemaContNode.withChild(modul2.build()); @@ -119,7 +119,7 @@ public class NnToXmlWithDataFromSeveralModulesTest extends return testNormalizedNodeContext; } - private static DataContainerNodeAttrBuilder buildContBuilderMod1( + private static DataContainerNodeBuilder buildContBuilderMod1( final String uri, final String rev, final String cont, final String contB, final String lf1, final String lf1Value) { final QName contQname = QName.create(uri, rev, cont); @@ -128,7 +128,7 @@ public class NnToXmlWithDataFromSeveralModulesTest extends final DataSchemaNode contSchemaNode = schemaContext .getDataChildByName(contQname); - final DataContainerNodeAttrBuilder dataContainerNodeAttrBuilder = Builders + final DataContainerNodeBuilder dataContainerNodeAttrBuilder = Builders .containerBuilder((ContainerSchemaNode) contSchemaNode); Preconditions.checkState(contSchemaNode instanceof ContainerSchemaNode); @@ -145,7 +145,7 @@ public class NnToXmlWithDataFromSeveralModulesTest extends final DataSchemaNode contBSchemaNode = ((ContainerSchemaNode) contSchemaNode) .getDataChildByName(contBQname); - final DataContainerNodeAttrBuilder dataContainerB = Builders + final DataContainerNodeBuilder dataContainerB = Builders .containerBuilder((ContainerSchemaNode) contBSchemaNode); return dataContainerNodeAttrBuilder.withChild(dataContainerB.build()); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java index 1224c3d389..0128a9323f 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java @@ -57,7 +57,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; 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.builder.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -237,7 +237,7 @@ public class CutDataToCorrectDepthTest extends JerseyTest { } private static ContainerNode container(final String localName, final DataContainerChild... children) { - final DataContainerNodeAttrBuilder containerBuilder = + final DataContainerNodeBuilder containerBuilder = Builders.containerBuilder(); for (final DataContainerChild child : children) { containerBuilder.withChild(child); @@ -260,7 +260,7 @@ public class CutDataToCorrectDepthTest extends JerseyTest { private static UnkeyedListEntryNode unkeyedEntry(final String localName, final DataContainerChild... children) { - final DataContainerNodeAttrBuilder builder = + final DataContainerNodeBuilder builder = Builders.unkeyedListEntryBuilder(); builder.withNodeIdentifier(toIdentifier(localName)); for (final DataContainerChild child : children) { @@ -280,7 +280,7 @@ public class CutDataToCorrectDepthTest extends JerseyTest { private static MapEntryNode mapEntryNode(final String localName, final int keysNumber, final DataContainerChild... children) { - final DataContainerNodeAttrBuilder builder = + final DataContainerNodeBuilder builder = Builders.mapEntryBuilder(); final Map keys = new HashMap<>(); for (int i = 0; i < keysNumber; i++) { diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java index dbdca84473..a244ed0675 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java @@ -56,8 +56,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; 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.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -135,13 +135,13 @@ public class InvokeRpcMethodTest { } assertNotNull(rpcInputSchemaNode); - final DataContainerNodeAttrBuilder container = + final DataContainerNodeBuilder container = Builders.containerBuilder(rpcInputSchemaNode); final QName contQName = QName.create(rpcModule.getQNameModule(), "cont"); final DataSchemaNode contSchemaNode = rpcInputSchemaNode.getDataChildByName(contQName); assertTrue(contSchemaNode instanceof ContainerSchemaNode); - final DataContainerNodeAttrBuilder contNode = + final DataContainerNodeBuilder contNode = Builders.containerBuilder((ContainerSchemaNode) contSchemaNode); final QName lfQName = QName.create(rpcModule.getQNameModule(), "lf"); @@ -284,7 +284,7 @@ public class InvokeRpcMethodTest { assertNotNull(rpcDef); assertNotNull(rpcInputSchemaNode); - final DataContainerNodeAttrBuilder containerBuilder = + final DataContainerNodeBuilder containerBuilder = Builders.containerBuilder(rpcInputSchemaNode); final NormalizedNodeContext payload = @@ -331,12 +331,12 @@ public class InvokeRpcMethodTest { } assertNotNull(rpcDef); assertNotNull(rpcOutputSchemaNode); - final DataContainerNodeAttrBuilder containerBuilder = + final DataContainerNodeBuilder containerBuilder = Builders.containerBuilder(rpcOutputSchemaNode); final DataSchemaNode leafSchema = rpcOutputSchemaNode .getDataChildByName(QName.create(rpcModule.getQNameModule(), "textOut")); assertTrue(leafSchema instanceof LeafSchemaNode); - final NormalizedNodeAttrBuilder> leafBuilder = + final NormalizedNodeBuilder> leafBuilder = Builders.leafBuilder((LeafSchemaNode) leafSchema); leafBuilder.withValue("brm"); containerBuilder.withChild(leafBuilder.build()); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java index 481898d4b1..bd5a8c0ccd 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java @@ -42,7 +42,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent 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.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.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.model.api.DataSchemaNode; @@ -237,7 +237,7 @@ public final class TestUtils { public static NormalizedNode prepareNormalizedNodeWithIetfInterfacesInterfacesData() throws ParseException { final String ietfInterfacesDate = "2013-07-04"; final String namespace = "urn:ietf:params:xml:ns:yang:ietf-interfaces"; - final DataContainerNodeAttrBuilder mapEntryNode = + final DataContainerNodeBuilder mapEntryNode = ImmutableMapEntryNodeBuilder.create(); final Map predicates = new HashMap<>(); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java index cb03a7f68a..808361346e 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java @@ -43,7 +43,6 @@ 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.LeafNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -129,7 +128,7 @@ public class URIParametersParsing { } assertNotNull("RPC ContainerSchemaNode was not found!", rpcInputSchemaNode); - final DataContainerNodeAttrBuilder container = + final DataContainerNodeBuilder container = Builders.containerBuilder(rpcInputSchemaNode); final QName pathQName = diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java index 6d37a2b786..748adef20f 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java @@ -33,7 +33,7 @@ import org.opendaylight.restconf.nb.rfc8040.rests.utils.SubscribeToStreamUtil; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.slf4j.Logger; @@ -95,7 +95,7 @@ public class RestconfStreamsSubscriptionServiceImpl implements RestconfStreamsSu // prepare node with value of location final InstanceIdentifierContext iid = SubscribeToStreamUtil.prepareIIDSubsStreamOutput(this.handlersHolder.getSchemaHandler()); - final NormalizedNodeAttrBuilder> builder = + final NormalizedNodeBuilder> builder = ImmutableLeafNodeBuilder.create().withValue(response.toString()); builder.withNodeIdentifier( NodeIdentifier.create(QName.create("subscribe:to:notification", "2016-10-28", "location"))); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java index e5b2ba2593..e162181f30 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java @@ -62,10 +62,9 @@ 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.builder.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -321,12 +320,12 @@ public final class ReadDataTransactionUtil { final DataSchemaContextTree baseSchemaCtxTree = DataSchemaContextTree.from(ctx); final DataSchemaNode baseSchemaNode = baseSchemaCtxTree.getChild(path).getDataSchemaNode(); if (result instanceof ContainerNode) { - final DataContainerNodeAttrBuilder builder = + final DataContainerNodeBuilder builder = Builders.containerBuilder((ContainerSchemaNode) baseSchemaNode); buildCont(builder, (ContainerNode) result, baseSchemaCtxTree, path, trim); return builder.build(); } else { - final DataContainerNodeAttrBuilder builder = + final DataContainerNodeBuilder builder = Builders.mapEntryBuilder((ListSchemaNode) baseSchemaNode); buildMapEntryBuilder(builder, (MapEntryNode) result, baseSchemaCtxTree, path, trim, ((ListSchemaNode) baseSchemaNode).getKeyDefinition()); @@ -335,14 +334,14 @@ public final class ReadDataTransactionUtil { } private static void buildMapEntryBuilder( - final DataContainerNodeAttrBuilder builder, + final DataContainerNodeBuilder builder, final MapEntryNode result, final DataSchemaContextTree baseSchemaCtxTree, final YangInstanceIdentifier actualPath, final boolean trim, final List keys) { for (final DataContainerChild child : result.getValue()) { final YangInstanceIdentifier path = actualPath.node(child.getIdentifier()); final DataSchemaNode childSchema = baseSchemaCtxTree.getChild(path).getDataSchemaNode(); if (child instanceof ContainerNode) { - final DataContainerNodeAttrBuilder childBuilder = + final DataContainerNodeBuilder childBuilder = Builders.containerBuilder((ContainerSchemaNode) childSchema); buildCont(childBuilder, (ContainerNode) child, baseSchemaCtxTree, path, trim); builder.withChild(childBuilder.build()); @@ -355,7 +354,7 @@ public final class ReadDataTransactionUtil { } else if (child instanceof LeafNode) { final Object defaultVal = ((LeafSchemaNode) childSchema).getType().getDefaultValue().orElse(null); final Object nodeVal = child.getValue(); - final NormalizedNodeAttrBuilder> leafBuilder = + final NormalizedNodeBuilder> leafBuilder = Builders.leafBuilder((LeafSchemaNode) childSchema); if (keys.contains(child.getNodeType())) { leafBuilder.withValue(((LeafNode) child).getValue()); @@ -383,21 +382,21 @@ public final class ReadDataTransactionUtil { for (final MapEntryNode mapEntryNode : result.getValue()) { final YangInstanceIdentifier actualNode = path.node(mapEntryNode.getIdentifier()); final DataSchemaNode childSchema = baseSchemaCtxTree.getChild(actualNode).getDataSchemaNode(); - final DataContainerNodeAttrBuilder mapEntryBuilder = + final DataContainerNodeBuilder mapEntryBuilder = Builders.mapEntryBuilder((ListSchemaNode) childSchema); buildMapEntryBuilder(mapEntryBuilder, mapEntryNode, baseSchemaCtxTree, actualNode, trim, keys); builder.withChild(mapEntryBuilder.build()); } } - private static void buildCont(final DataContainerNodeAttrBuilder builder, + private static void buildCont(final DataContainerNodeBuilder builder, final ContainerNode result, final DataSchemaContextTree baseSchemaCtxTree, final YangInstanceIdentifier actualPath, final boolean trim) { for (final DataContainerChild child : result.getValue()) { final YangInstanceIdentifier path = actualPath.node(child.getIdentifier()); final DataSchemaNode childSchema = baseSchemaCtxTree.getChild(path).getDataSchemaNode(); if (child instanceof ContainerNode) { - final DataContainerNodeAttrBuilder builderChild = + final DataContainerNodeBuilder builderChild = Builders.containerBuilder((ContainerSchemaNode) childSchema); buildCont(builderChild, result, baseSchemaCtxTree, actualPath, trim); builder.withChild(builderChild.build()); @@ -410,7 +409,7 @@ public final class ReadDataTransactionUtil { } else if (child instanceof LeafNode) { final Object defaultVal = ((LeafSchemaNode) childSchema).getType().getDefaultValue().orElse(null); final Object nodeVal = child.getValue(); - final NormalizedNodeAttrBuilder> leafBuilder = + final NormalizedNodeBuilder> leafBuilder = Builders.leafBuilder((LeafSchemaNode) childSchema); if (trim) { if (defaultVal == null || !defaultVal.equals(nodeVal)) { @@ -610,7 +609,7 @@ public final class ReadDataTransactionUtil { return builder.build(); } else if (configDataNode instanceof ContainerNode) { - final DataContainerNodeAttrBuilder builder = Builders + final DataContainerNodeBuilder builder = Builders .containerBuilder().withNodeIdentifier(((ContainerNode) configDataNode).getIdentifier()); mapValueToBuilder( @@ -657,7 +656,7 @@ public final class ReadDataTransactionUtil { ((UnkeyedListNode) stateDataNode).getValue(), builder); return builder.build(); } else if (configDataNode instanceof UnkeyedListEntryNode) { - final DataContainerNodeAttrBuilder builder = Builders + final DataContainerNodeBuilder builder = Builders .unkeyedListEntryBuilder().withNodeIdentifier(((UnkeyedListEntryNode) configDataNode).getIdentifier()); mapValueToBuilder(((UnkeyedListEntryNode) configDataNode).getValue(), diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/impl/RestconfOperationsServiceImpl.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/impl/RestconfOperationsServiceImpl.java index ac06d24fae..e543fd050a 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/impl/RestconfOperationsServiceImpl.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/services/simple/impl/RestconfOperationsServiceImpl.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -131,7 +131,7 @@ public class RestconfOperationsServiceImpl implements RestconfOperationsService } final ContainerSchemaNode fakeCont = new FakeContainerSchemaNode(fakeRpcSchema); - final DataContainerNodeAttrBuilder containerBuilder = + final DataContainerNodeBuilder containerBuilder = Builders.containerBuilder(fakeCont); for (final LeafSchemaNode leaf : fakeRpcSchema) { diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java index a37f65850c..68e03c4121 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtil.java @@ -36,7 +36,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.OrderedMapNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -79,7 +79,7 @@ public final class RestconfMappingNodeUtil { final SchemaContext context, final String moduleSetId) { final DataSchemaNode modulesStateSch = ietfYangLibraryModule.getDataChildByName(IetfYangLibrary.MODUELS_STATE_CONT_QNAME); - final DataContainerNodeAttrBuilder modulesStateBuilder = + final DataContainerNodeBuilder modulesStateBuilder = Builders.containerBuilder((ContainerSchemaNode) modulesStateSch); final DataSchemaNode moduleSetIdSch = @@ -115,7 +115,7 @@ public final class RestconfMappingNodeUtil { private static void fillMapByModules(final CollectionNodeBuilder mapBuilder, final DataSchemaNode moduleSch, final boolean isSubmodule, final Module module, final Module ietfYangLibraryModule, final SchemaContext context) { - final DataContainerNodeAttrBuilder mapEntryBuilder = + final DataContainerNodeBuilder mapEntryBuilder = Builders.mapEntryBuilder((ListSchemaNode) moduleSch); addCommonLeafs(module, mapEntryBuilder, ietfYangLibraryModule); addChildOfModuleBySpecificModuleInternal( @@ -162,7 +162,7 @@ public final class RestconfMappingNodeUtil { * schema context */ private static void addSubmodules(final Module module, - final DataContainerNodeAttrBuilder mapEntryBuilder, + final DataContainerNodeBuilder mapEntryBuilder, final Module ietfYangLibraryModule, final SchemaContext context) { final DataSchemaNode listSubm = findSchemaInListOfModulesSchema( IetfYangLibrary.SPECIFIC_MODULE_SUBMODULE_LIST_QNAME, ietfYangLibraryModule); @@ -187,14 +187,14 @@ public final class RestconfMappingNodeUtil { * schema context */ private static void addDeviationList(final Module module, - final DataContainerNodeAttrBuilder mapEntryBuilder, + final DataContainerNodeBuilder mapEntryBuilder, final Module ietfYangLibraryModule, final SchemaContext context) { final DataSchemaNode deviationsSchema = findSchemaInListOfModulesSchema( IetfYangLibrary.SPECIFIC_MODULE_DEVIATION_LIST_QNAME, ietfYangLibraryModule); final CollectionNodeBuilder deviations = Builders.mapBuilder((ListSchemaNode) deviationsSchema); for (final Deviation deviation : module.getDeviations()) { - final DataContainerNodeAttrBuilder deviationEntryNode = + final DataContainerNodeBuilder deviationEntryNode = Builders.mapEntryBuilder((ListSchemaNode) deviationsSchema); final QName lastComponent = deviation.getTargetPath().getLastComponent(); addChildOfModuleBySpecificModule(IetfYangLibrary.SPECIFIC_MODULE_NAME_LEAF_QNAME, deviationEntryNode, @@ -220,7 +220,7 @@ public final class RestconfMappingNodeUtil { * ieat-yang-library module */ private static void addFeatureLeafList(final QName qnameOfFeaturesLeafList, - final DataContainerNodeAttrBuilder mapEntryBuilder, + final DataContainerNodeBuilder mapEntryBuilder, final Set features, final Module ietfYangLibraryModule) { final DataSchemaNode schemaNode = findSchemaInListOfModulesSchema(qnameOfFeaturesLeafList, ietfYangLibraryModule); @@ -245,7 +245,7 @@ public final class RestconfMappingNodeUtil { * ietf-yang-library module */ private static void addCommonLeafs(final Module module, - final DataContainerNodeAttrBuilder mapEntryBuilder, + final DataContainerNodeBuilder mapEntryBuilder, final Module ietfYangLibraryModule) { addChildOfModuleBySpecificModuleInternal(IetfYangLibrary.SPECIFIC_MODULE_NAME_LEAF_QNAME, mapEntryBuilder, module.getName(), ietfYangLibraryModule); @@ -266,7 +266,7 @@ public final class RestconfMappingNodeUtil { * ietf-yang-library module */ private static void addChildOfModuleBySpecificModuleOfListChild(final QName specificQName, - final DataContainerNodeAttrBuilder mapEntryBuilder, + final DataContainerNodeBuilder mapEntryBuilder, final Object value, final Module ietfYangLibraryModule) { final DataSchemaNode leafSch = findSchemaInListOfModulesSchema(specificQName, ietfYangLibraryModule); mapEntryBuilder.withChild(Builders.leafBuilder((LeafSchemaNode) leafSch).withValue(value).build()); @@ -306,7 +306,7 @@ public final class RestconfMappingNodeUtil { * ietf-yang-library module */ private static void addChildOfModuleBySpecificModuleInternal(final QName specifiLeafQName, - final DataContainerNodeAttrBuilder mapEntryBuilder, + final DataContainerNodeBuilder mapEntryBuilder, final Object value, final Module ietfYangLibraryModule) { final DataSchemaNode nameLeaf = findNodeInInternGroupings(specifiLeafQName, ietfYangLibraryModule); mapEntryBuilder.withChild(Builders.leafBuilder((LeafSchemaNode) nameLeaf).withValue(value).build()); @@ -349,7 +349,7 @@ public final class RestconfMappingNodeUtil { * ietf-yang-library module */ private static void addChildOfModuleBySpecificModule(final QName specifiLeafQName, - final DataContainerNodeAttrBuilder mapEntryBuilder, + final DataContainerNodeBuilder mapEntryBuilder, final Object value, final Module ietfYangLibraryModule) { final DataSchemaNode nameLeaf = findNodeInGroupings(specifiLeafQName, ietfYangLibraryModule); mapEntryBuilder.withChild(Builders.leafBuilder((LeafSchemaNode) nameLeaf).withValue(value).build()); @@ -384,11 +384,11 @@ public final class RestconfMappingNodeUtil { mapCapabilites(final Module monitoringModule) { final DataSchemaNode restconfState = monitoringModule.getDataChildByName(MonitoringModule.CONT_RESTCONF_STATE_QNAME); - final DataContainerNodeAttrBuilder restStateContBuilder = + final DataContainerNodeBuilder restStateContBuilder = Builders.containerBuilder((ContainerSchemaNode) restconfState); final DataSchemaNode capabilitesContSchema = getChildOfCont((ContainerSchemaNode) restconfState, MonitoringModule.CONT_CAPABILITES_QNAME); - final DataContainerNodeAttrBuilder capabilitesContBuilder = + final DataContainerNodeBuilder capabilitesContBuilder = Builders.containerBuilder((ContainerSchemaNode) capabilitesContSchema); final DataSchemaNode leafListCapa = getChildOfCont((ContainerSchemaNode) capabilitesContSchema, MonitoringModule.LEAF_LIST_CAPABILITY_QNAME); @@ -484,7 +484,7 @@ public final class RestconfMappingNodeUtil { .getDataChildByName(MonitoringModule.CONT_RESTCONF_STATE_QNAME)) .getDataChildByName(MonitoringModule.CONT_STREAMS_QNAME)) .getDataChildByName(MonitoringModule.LIST_STREAM_QNAME); - final DataContainerNodeAttrBuilder streamEntry = + final DataContainerNodeBuilder streamEntry = Builders.mapEntryBuilder((ListSchemaNode) streamListSchema); final ListSchemaNode listSchema = (ListSchemaNode) streamListSchema; @@ -525,10 +525,10 @@ public final class RestconfMappingNodeUtil { } private static void prepareListAndFillEntryBuilder( - final DataContainerNodeAttrBuilder streamEntry, + final DataContainerNodeBuilder streamEntry, final ListSchemaNode listSchemaNode, final String outputType, final URI uriToWebsocketServer) { final CollectionNodeBuilder accessListBuilder = Builders.mapBuilder(listSchemaNode); - final DataContainerNodeAttrBuilder entryAccessList = + final DataContainerNodeBuilder entryAccessList = Builders.mapEntryBuilder(listSchemaNode); prepareLeafAndFillEntryBuilder(entryAccessList, listSchemaNode.getDataChildByName(MonitoringModule.LEAF_ENCODING_ACCESS_QNAME), outputType); @@ -546,7 +546,7 @@ public final class RestconfMappingNodeUtil { * @param value Value */ private static void prepareLeafAndFillEntryBuilder( - final DataContainerNodeAttrBuilder streamEntry, + final DataContainerNodeBuilder streamEntry, final DataSchemaNode leafSchema, final Object value) { streamEntry.withChild(Builders.leafBuilder((LeafSchemaNode) leafSchema).withValue(value).build()); } @@ -587,7 +587,7 @@ public final class RestconfMappingNodeUtil { .getDataChildByName(MonitoringModule.CONT_RESTCONF_STATE_QNAME)) .getDataChildByName(MonitoringModule.CONT_STREAMS_QNAME)) .getDataChildByName(MonitoringModule.LIST_STREAM_QNAME); - final DataContainerNodeAttrBuilder streamEntry = + final DataContainerNodeBuilder streamEntry = Builders.mapEntryBuilder((ListSchemaNode) streamListSchema); final ListSchemaNode listSchema = (ListSchemaNode) streamListSchema; diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java index b9a5a4c867..0b3fd47f14 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java @@ -53,7 +53,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent 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.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.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.model.api.DataSchemaNode; @@ -250,7 +250,7 @@ public final class TestUtils { public static NormalizedNode prepareNormalizedNodeWithIetfInterfacesInterfacesData() throws ParseException { final String ietfInterfacesDate = "2013-07-04"; final String namespace = "urn:ietf:params:xml:ns:yang:ietf-interfaces"; - final DataContainerNodeAttrBuilder mapEntryNode = + final DataContainerNodeBuilder mapEntryNode = ImmutableMapEntryNodeBuilder.create(); final Map predicates = new HashMap<>(); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/CreateStreamUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/CreateStreamUtilTest.java index 6b289e4afd..e471da63af 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/CreateStreamUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/CreateStreamUtilTest.java @@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; 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.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -95,7 +95,7 @@ public class CreateStreamUtilTest { } assertNotNull(rpcInputSchemaNode); - final DataContainerNodeAttrBuilder container = + final DataContainerNodeBuilder container = Builders.containerBuilder(rpcInputSchemaNode); final QName lfQName = QName.create(rpcModule.getQNameModule(), inputOutputName); -- 2.36.6