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;
.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));
}
return immediateFluentFuture(yangTextSchemaSource);
}).when(sourceProvider).getSource(any(SourceIdentifier.class));
- this.currentSchemaContext = CurrentSchemaContext.create(schemaService, sourceProvider);
+ currentSchemaContext = CurrentSchemaContext.create(schemaService, sourceProvider);
}
@After
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;
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.");
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.
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<Optional<Object>> result = immediateFluentFuture(Optional.of(NODE));
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 {
.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);
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;
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())
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;
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);
}
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();
}
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;
* @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)
*/
private static UnkeyedListEntryNode createErrorEntry(final RestconfError restconfError) {
// filling in mandatory leafs
- final DataContainerNodeBuilder<NodeIdentifier, UnkeyedListEntryNode> 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) {
*/
@VisibleForTesting
void setHttpHeaders(final HttpHeaders httpHeaders) {
- this.headers = httpHeaders;
+ headers = httpHeaders;
}
}
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;
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());
}
/**
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;
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<NodeIdentifierWithPredicates, MapEntryNode> mapEntryNode =
- ImmutableMapEntryNodeBuilder.create();
-
- final Map<String, Object> predicates = new HashMap<>();
- predicates.put("name", "eth0");
-
- mapEntryNode.withNodeIdentifier(getNodeIdentifierPredicate("interface", namespace, ietfInterfacesDate,
- predicates));
- mapEntryNode
- .withChild(new ImmutableLeafNodeBuilder<String>()
- .withNodeIdentifier(getNodeIdentifier("name", namespace, ietfInterfacesDate)).withValue("eth0")
- .build());
- mapEntryNode.withChild(new ImmutableLeafNodeBuilder<String>()
- .withNodeIdentifier(getNodeIdentifier("type", namespace, ietfInterfacesDate))
- .withValue("ethernetCsmacd").build());
- mapEntryNode.withChild(new ImmutableLeafNodeBuilder<Boolean>()
- .withNodeIdentifier(getNodeIdentifier("enabled", namespace, ietfInterfacesDate))
- .withValue(Boolean.FALSE).build());
- mapEntryNode.withChild(new ImmutableLeafNodeBuilder<String>()
- .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) {
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;
/**
@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
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;
}
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();
}
/**