import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
-import org.apache.log4j.BasicConfigurator;
+import org.eclipse.jdt.annotation.NonNull;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
-import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.SystemLeafSetNode;
+import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.CollectionNodeBuilder;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.ListNodeBuilder;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.NormalizedNodeBuilder;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefContext;
import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefDataValidationFailedException;
import org.opendaylight.yangtools.yang.data.impl.leafref.LeafRefValidation;
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.tree.InMemoryDataTreeFactory;
import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DataTreeCandidateValidatorTest {
- private static SchemaContext context;
+ private static EffectiveModelContext context;
private static Module valModule;
private static QNameModule valModuleQname;
private static LeafRefContext rootLeafRefContext;
private static final Logger LOG = LoggerFactory.getLogger(DataTreeCandidateValidatorTest.class);
private static final String NEW_LINE = System.getProperty("line.separator");
- static {
- BasicConfigurator.configure();
- }
-
@BeforeClass
- public static void init() {
+ public static void init() throws DataValidationFailedException {
context = YangParserTestUtils.parseYangResourceDirectory("/leafref-validation");
- final Set<Module> modules = context.getModules();
- for (final Module module : modules) {
+ for (final Module module : context.getModules()) {
if (module.getName().equals("leafref-validation")) {
valModule = module;
}
final DataTreeModification initialDataTreeModification = inMemoryDataTree
.takeSnapshot().newModification();
- final ContainerSchemaNode odlProjContSchemaNode = (ContainerSchemaNode) valModule
- .getDataChildByName(odl);
+ final ContainerSchemaNode odlProjContSchemaNode = (ContainerSchemaNode) valModule.findDataChildByName(odl)
+ .get();
final ContainerNode odlProjectContainer = createOdlContainer(odlProjContSchemaNode);
}
@Test
- public void dataTreeCanditateValidationTest() {
+ public void dataTreeCanditateValidationTest() throws DataValidationFailedException {
write();
write2();
writeIntoMapEntry();
}
- private static void writeContributors() {
+ private static void writeContributors() throws DataValidationFailedException {
final ContainerSchemaNode contributorContSchemaNode = (ContainerSchemaNode) valModule
- .getDataChildByName(odlContributor);
+ .findDataChildByName(odlContributor).get();
final ContainerNode contributorContainer = createBasicContributorContainer(contributorContSchemaNode);
}
- private static void writeIntoMapEntry() {
+ private static void writeIntoMapEntry() throws DataValidationFailedException {
final Map<QName, Object> keys = new HashMap<>();
keys.put(name, "New Project");
- final NodeIdentifierWithPredicates mapEntryPath = new NodeIdentifierWithPredicates(
- project, keys);
+ final NodeIdentifierWithPredicates mapEntryPath = NodeIdentifierWithPredicates.of(project, keys);
final YangInstanceIdentifier leaderPath = YangInstanceIdentifier
.of(odl).node(project).node(mapEntryPath).node(lead);
}
- private static void writeMapEntry() {
+ private static void writeMapEntry() throws DataValidationFailedException {
final Map<QName, Object> keys = new HashMap<>();
keys.put(name, "New Project");
- final NodeIdentifierWithPredicates mapEntryPath = new NodeIdentifierWithPredicates(
- project, keys);
+ final NodeIdentifierWithPredicates mapEntryPath = NodeIdentifierWithPredicates.of(project, keys);
final YangInstanceIdentifier newOdlProjectMapEntryPath = YangInstanceIdentifier
.of(odl).node(project).node(mapEntryPath);
- final ContainerSchemaNode odlProjContSchemaNode = (ContainerSchemaNode) valModule
- .getDataChildByName(odl);
- final ListSchemaNode projListSchemaNode = (ListSchemaNode) odlProjContSchemaNode
- .getDataChildByName(project);
+ final ContainerSchemaNode odlProjContSchemaNode = (ContainerSchemaNode) valModule.findDataChildByName(odl)
+ .get();
+ final ListSchemaNode projListSchemaNode = (ListSchemaNode) odlProjContSchemaNode.findDataChildByName(project)
+ .get();
final MapEntryNode newProjectMapEntry = createProjectListEntry(
"New Project", "New Project description ...",
"Leader of New Project", "Owner of New Project",
}
- private static void write() {
+ private static void write() throws DataValidationFailedException {
final ContainerSchemaNode contributorContSchemaNode = (ContainerSchemaNode) valModule
- .getDataChildByName(odlContributor);
+ .findDataChildByName(odlContributor).get();
final ContainerNode contributorContainer = createContributorContainer(contributorContSchemaNode);
assertTrue(exception);
}
- private static void write2() {
+ private static void write2() throws DataValidationFailedException {
- final ContainerSchemaNode odlCon = (ContainerSchemaNode) valModule
- .getDataChildByName(odl);
- final ContainerSchemaNode con1Con = (ContainerSchemaNode) odlCon
- .getDataChildByName(con1);
+ final ContainerSchemaNode odlCon = (ContainerSchemaNode) valModule.findDataChildByName(odl).get();
+ final ContainerSchemaNode con1Con = (ContainerSchemaNode) odlCon.findDataChildByName(con1).get();
final LeafNode<String> l1Leaf = ImmutableNodes.leafNode(l1, "l1 value");
- final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> containerBuilder = Builders
+ final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> containerBuilder = Builders
.containerBuilder(con1Con);
containerBuilder.addChild(l1Leaf);
final ContainerNode con1Node = containerBuilder.build();
}
- private static LeafSetNode<?> createLeafRefLeafListNode() {
-
- final ListNodeBuilder<Object, LeafSetEntryNode<Object>> leafSetBuilder = Builders
- .leafSetBuilder();
- leafSetBuilder.withNodeIdentifier(new NodeIdentifier(leafrefLeafList));
-
- leafSetBuilder.addChild(createLeafSetEntry(leafrefLeafList, "k1"));
- leafSetBuilder.addChild(createLeafSetEntry(leafrefLeafList, "k2"));
- leafSetBuilder.addChild(createLeafSetEntry(leafrefLeafList, "k3"));
-
- return leafSetBuilder.build();
+ private static @NonNull LeafSetNode<Object> createLeafRefLeafListNode() {
+ return Builders.leafSetBuilder()
+ .withNodeIdentifier(new NodeIdentifier(leafrefLeafList))
+ .addChild(createLeafSetEntry(leafrefLeafList, "k1"))
+ .addChild(createLeafSetEntry(leafrefLeafList, "k2"))
+ .addChild(createLeafSetEntry(leafrefLeafList, "k3"))
+ .build();
}
private static ContainerNode createCon3Node() {
- final CollectionNodeBuilder<MapEntryNode, MapNode> mapBuilder = Builders
- .mapBuilder();
+ final CollectionNodeBuilder<MapEntryNode, SystemMapNode> mapBuilder = Builders.mapBuilder();
mapBuilder.withNodeIdentifier(new NodeIdentifier(list3InChoice));
mapBuilder.addChild(createList3Entry("k1", "val1", "valA", "valX"));
choiceBuilder.addChild(mapBuilder.build());
- final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> containerBuilder = Builders
+ final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> containerBuilder = Builders
.containerBuilder();
containerBuilder.withNodeIdentifier(new NodeIdentifier(con3));
private static MapEntryNode createList3Entry(final String keyVal,
final String l3Val1, final String l3Val2, final String l3Val3) {
- final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> mapEntryBuilder = Builders
+ final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> mapEntryBuilder = Builders
.mapEntryBuilder();
- mapEntryBuilder.withNodeIdentifier(new NodeIdentifierWithPredicates(
- list3InChoice, k, keyVal));
+ mapEntryBuilder.withNodeIdentifier(NodeIdentifierWithPredicates.of(list3InChoice, k, keyVal));
- final ListNodeBuilder<Object, LeafSetEntryNode<Object>> leafSetBuilder = Builders
- .leafSetBuilder();
+ final ListNodeBuilder<Object, SystemLeafSetNode<Object>> leafSetBuilder = Builders.leafSetBuilder();
leafSetBuilder.withNodeIdentifier(new NodeIdentifier(l3));
leafSetBuilder.addChild(createLeafSetEntry(l3, l3Val1));
private static LeafSetEntryNode<Object> createLeafSetEntry(
final QName qname, final String val) {
- final NormalizedNodeAttrBuilder<NodeWithValue, Object, LeafSetEntryNode<Object>> leafSetEntryBuilder = Builders
+ final NormalizedNodeBuilder<NodeWithValue, Object, LeafSetEntryNode<Object>> leafSetEntryBuilder = Builders
.leafSetEntryBuilder();
leafSetEntryBuilder.withNodeIdentifier(new NodeWithValue<>(qname, val));
leafSetEntryBuilder.withValue(val);
private static ChoiceNode createChoiceNode() {
- final CollectionNodeBuilder<MapEntryNode, MapNode> listInChoiceBuilder = Builders
- .mapBuilder();
- listInChoiceBuilder
- .withNodeIdentifier(new NodeIdentifier(listInChoice));
+ final CollectionNodeBuilder<MapEntryNode, SystemMapNode> listInChoiceBuilder = Builders.mapBuilder();
+ listInChoiceBuilder.withNodeIdentifier(new NodeIdentifier(listInChoice));
- listInChoiceBuilder.addChild(createListInChoiceEntry("key1",
- "leafref-in-choice value", "val1"));
- listInChoiceBuilder.addChild(createListInChoiceEntry("key2",
- "l1 value", "val2"));
- listInChoiceBuilder.addChild(createListInChoiceEntry("key3",
- "l1 value", "val3"));
+ listInChoiceBuilder.addChild(createListInChoiceEntry("key1", "leafref-in-choice value", "val1"));
+ listInChoiceBuilder.addChild(createListInChoiceEntry("key2", "l1 value", "val2"));
+ listInChoiceBuilder.addChild(createListInChoiceEntry("key3", "l1 value", "val3"));
- final DataContainerNodeBuilder<NodeIdentifier, ChoiceNode> choice2Builder = Builders
- .choiceBuilder();
+ final DataContainerNodeBuilder<NodeIdentifier, ChoiceNode> choice2Builder = Builders.choiceBuilder();
choice2Builder.withNodeIdentifier(new NodeIdentifier(ch2));
choice2Builder.addChild(listInChoiceBuilder.build());
- final DataContainerNodeBuilder<NodeIdentifier, ChoiceNode> choiceBuilder = Builders
- .choiceBuilder();
+ final DataContainerNodeBuilder<NodeIdentifier, ChoiceNode> choiceBuilder = Builders.choiceBuilder();
choiceBuilder.withNodeIdentifier(new NodeIdentifier(ch1));
choiceBuilder.addChild(choice2Builder.build());
final String leafrefInChoiceVal,
final String leafrefInChoiceToChoiceVal) {
- final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> mapEntryBuilder = Builders
+ final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> mapEntryBuilder = Builders
.mapEntryBuilder();
- mapEntryBuilder.withNodeIdentifier(new NodeIdentifierWithPredicates(
+ mapEntryBuilder.withNodeIdentifier(NodeIdentifierWithPredicates.of(
listInChoice, listInChoiceKey, keyVal));
mapEntryBuilder.addChild(ImmutableNodes.leafNode(listInChoiceKey,
return mapEntryBuilder.build();
}
- private static void delete() {
+ private static void delete() throws DataValidationFailedException {
final YangInstanceIdentifier contributorPath = YangInstanceIdentifier
.of(odlContributor);
delete.delete(contributorPath);
delete.ready();
- final DataTreeCandidate deleteContributorsCanditate = inMemoryDataTree
- .prepare(delete);
+ final DataTreeCandidate deleteContributorsCanditate = inMemoryDataTree.prepare(delete);
LOG.debug("*************************");
LOG.debug("Before delete: ");
private static ContainerNode createContributorContainer(
final ContainerSchemaNode contributorContSchemaNode) {
- final ListSchemaNode contributorListSchemaNode = (ListSchemaNode) contributorContSchemaNode
- .getDataChildByName(contributor);
+ final ListSchemaNode contributorListSchemaNode =
+ (ListSchemaNode) contributorContSchemaNode.findDataChildByName(contributor).get();
- final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> contributorContainerBldr = Builders
- .containerBuilder(contributorContSchemaNode);
+ final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> contributorContainerBldr =
+ Builders.containerBuilder(contributorContSchemaNode);
- final MapNode contributorMap = createContributorList(contributorListSchemaNode);
+ final SystemMapNode contributorMap = createContributorList(contributorListSchemaNode);
contributorContainerBldr.addChild(contributorMap);
- final ContainerNode contributorContainer = contributorContainerBldr
- .build();
+ final ContainerNode contributorContainer = contributorContainerBldr.build();
return contributorContainer;
}
- private static MapNode createContributorList(
+ private static SystemMapNode createContributorList(
final ListSchemaNode contributorListSchemaNode) {
- final CollectionNodeBuilder<MapEntryNode, MapNode> contributorMapBldr = Builders
- .mapBuilder(contributorListSchemaNode);
+ final CollectionNodeBuilder<MapEntryNode, SystemMapNode> contributorMapBldr =
+ Builders.mapBuilder(contributorListSchemaNode);
final MapEntryNode contributorMapEntry1 = createContributorListEntry(
"Leader of Yangtools", "Yangtools Leader name", "Yangtools",
contributorMapBldr.addChild(contributorMapEntry7);
contributorMapBldr.addChild(contributorMapEntry8);
- final MapNode contributorMap = contributorMapBldr.build();
-
- return contributorMap;
-
+ return contributorMapBldr.build();
}
private static MapEntryNode createContributorListEntry(
final String odlProjectNameVal, final String odlProjectDescVal,
final ListSchemaNode contributorListSchemaNode) {
- final LeafNode<String> loginLeaf = ImmutableNodes.leafNode(login,
- loginVal);
- final LeafNode<String> contributorNameLeaf = ImmutableNodes.leafNode(
- contributorName, contributorNameVal);
- final LeafNode<String> odlProjectNameLeafRef = ImmutableNodes.leafNode(
- odlProjectName, odlProjectNameVal);
- final LeafNode<String> odlProjectDescLeafRef = ImmutableNodes.leafNode(
- odlProjectDesc, odlProjectDescVal);
+ final LeafNode<String> loginLeaf = ImmutableNodes.leafNode(login, loginVal);
+ final LeafNode<String> contributorNameLeaf = ImmutableNodes.leafNode(contributorName, contributorNameVal);
+ final LeafNode<String> odlProjectNameLeafRef = ImmutableNodes.leafNode(odlProjectName, odlProjectNameVal);
+ final LeafNode<String> odlProjectDescLeafRef = ImmutableNodes.leafNode(odlProjectDesc, odlProjectDescVal);
return Builders.mapEntryBuilder(contributorListSchemaNode)
.addChild(loginLeaf)
private static ContainerNode createOdlContainer(
final ContainerSchemaNode container) {
- final ListSchemaNode projListSchemaNode = (ListSchemaNode) container
- .getDataChildByName(project);
+ final ListSchemaNode projListSchemaNode = (ListSchemaNode) container.findDataChildByName(project).get();
- final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> odlProjectContainerBldr = Builders
+ final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> odlProjectContainerBldr = Builders
.containerBuilder(container);
- final MapNode projectMap = createProjectList(projListSchemaNode);
+ final SystemMapNode projectMap = createProjectList(projListSchemaNode);
odlProjectContainerBldr.addChild(projectMap);
final ContainerNode odlProjectContainer = odlProjectContainerBldr
return odlProjectContainer;
}
- private static MapNode createProjectList(
+ private static SystemMapNode createProjectList(
final ListSchemaNode projListSchemaNode) {
- final CollectionNodeBuilder<MapEntryNode, MapNode> projectMapBldr = Builders
+ final CollectionNodeBuilder<MapEntryNode, SystemMapNode> projectMapBldr = Builders
.mapBuilder(projListSchemaNode);
final MapEntryNode projMapEntry1 = createProjectListEntry("Yangtools",
projectMapBldr.addChild(projMapEntry2);
projectMapBldr.addChild(projMapEntry3);
- final MapNode projectMap = projectMapBldr.build();
-
- return projectMap;
+ return projectMapBldr.build();
}
private static MapEntryNode createProjectListEntry(final String nameVal,
final LeafNode<String> ownerLeafRef = ImmutableNodes.leafNode(owner,
ownerVal);
- final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> projMapEntryBldr = Builders
+ final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> projMapEntryBldr = Builders
.mapEntryBuilder(projListSchemaNode);
projMapEntryBldr.addChild(nameLeaf);
final ContainerSchemaNode contributorContSchemaNode) {
final ListSchemaNode contributorListSchemaNode = (ListSchemaNode) contributorContSchemaNode
- .getDataChildByName(contributor);
+ .findDataChildByName(contributor).get();
- final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> contributorContainerBldr = Builders
+ final DataContainerNodeBuilder<NodeIdentifier, ContainerNode> contributorContainerBldr = Builders
.containerBuilder(contributorContSchemaNode);
- final MapNode contributorMap = createBasicContributorList(contributorListSchemaNode);
+ final SystemMapNode contributorMap = createBasicContributorList(contributorListSchemaNode);
contributorContainerBldr.addChild(contributorMap);
final ContainerNode contributorContainer = contributorContainerBldr
}
- private static MapNode createBasicContributorList(
+ private static SystemMapNode createBasicContributorList(
final ListSchemaNode contributorListSchemaNode) {
- final CollectionNodeBuilder<MapEntryNode, MapNode> contributorMapBldr = Builders
- .mapBuilder(contributorListSchemaNode);
+ final CollectionNodeBuilder<MapEntryNode, SystemMapNode> contributorMapBldr =
+ Builders.mapBuilder(contributorListSchemaNode);
final MapEntryNode contributorMapEntry1 = createContributorListEntry(
"Leader of Yangtools", "Yangtools Leader name", "Yangtools",
contributorMapBldr.addChild(contributorMapEntry2);
contributorMapBldr.addChild(contributorMapEntry3);
- final MapNode contributorMap = contributorMapBldr.build();
-
- return contributorMap;
+ return contributorMapBldr.build();
}
}
Code Review / yangtools.git / blobdiff