*/
package org.opendaylight.yangtools.yang.data.impl.schema;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import static com.google.common.base.Preconditions.checkState;
+
+import com.google.common.collect.ImmutableSet;
import java.io.File;
-import java.io.FileNotFoundException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collections;
-import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.yangtools.yang.common.QName;
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.impl.TestUtils;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableChoiceNodeSchemaAwareBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapNodeSchemaAwareBuilder;
-import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
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.parser.spi.meta.ReactorException;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
public class NormalizedDataBuilderTest {
private SchemaContext schema;
@Before
- public void setUp() throws URISyntaxException, FileNotFoundException, ReactorException {
- final File resourceFile = new File(getClass().getResource(
- "test.yang").toURI());
- schema = TestUtils.parseYangSources(resourceFile);
+ public void setUp() throws URISyntaxException {
+ schema = YangParserTestUtils.parseYangFiles(new File(getClass().getResource("test.yang").toURI()));
containerNode = (ContainerSchemaNode) getSchemaNode(schema, "test", "container");
}
.containerBuilder().withNodeIdentifier(getNodeIdentifier("container"));
// leaf
- LeafNode<String> leafChild = Builders.<String> leafBuilder().withNodeIdentifier(getNodeIdentifier("leaf"))
+ LeafNode<String> leafChild = Builders.<String>leafBuilder().withNodeIdentifier(getNodeIdentifier("leaf"))
.withValue("String").build();
builder.withChild(leafChild);
// leafList
- LeafSetNode<Integer> leafList = Builders
- .<Integer> leafSetBuilder()
+ LeafSetNode<Integer> leafList = Builders.<Integer>leafSetBuilder()
.withNodeIdentifier(getNodeIdentifier("leaf"))
.withChildValue(1)
.withChild(
- Builders.<Integer> leafSetEntryBuilder()
+ Builders.<Integer>leafSetEntryBuilder()
.withNodeIdentifier(getNodeWithValueIdentifier("leaf", 3)).withValue(3).build())
.build();
builder.withChild(leafList);
MapEntryNode listChild1 = Builders
.mapEntryBuilder()
.withChild(
- Builders.<Integer> leafBuilder().withNodeIdentifier(getNodeIdentifier("uint32InList"))
+ Builders.<Integer>leafBuilder().withNodeIdentifier(getNodeIdentifier("uint32InList"))
.withValue(1).build())
.withChild(Builders.containerBuilder().withNodeIdentifier(getNodeIdentifier("containerInList")).build())
- .withNodeIdentifier(
- new NodeIdentifierWithPredicates(
+ .withNodeIdentifier(NodeIdentifierWithPredicates.of(
getNodeIdentifier("list").getNodeType(), Collections.singletonMap(
getNodeIdentifier("uint32InList").getNodeType(), 1))).build();
AugmentationNode augmentation = Builders
.augmentationBuilder()
.withNodeIdentifier(
- new AugmentationIdentifier(Sets.newHashSet(getQName("augmentUint32"))))
+ new AugmentationIdentifier(ImmutableSet.of(getQName("augmentUint32"))))
.withChild(
Builders.<Integer>leafBuilder().withNodeIdentifier(getNodeIdentifier("augmentUint32"))
.withValue(11).build()).build();
// This works without schema (adding child from augment as a direct
// child)
- builder.withChild(Builders.<Integer> leafBuilder().withNodeIdentifier(getNodeIdentifier("augmentUint32"))
+ builder.withChild(Builders.<Integer>leafBuilder().withNodeIdentifier(getNodeIdentifier("augmentUint32"))
.withValue(11).build());
}
@Test
public void testSchemaAware() {
- DataContainerNodeBuilder<NodeIdentifier, ContainerNode> builder = Builders
- .containerBuilder(containerNode);
+ DataContainerNodeBuilder<NodeIdentifier, ContainerNode> builder = Builders.containerBuilder(containerNode);
LeafSchemaNode schemaNode = (LeafSchemaNode) getSchemaNode(schema, "test", "uint32");
- LeafNode<String> leafChild = Builders.<String> leafBuilder(schemaNode).withValue("String").build();
+ LeafNode<String> leafChild = Builders.<String>leafBuilder(schemaNode).withValue("String").build();
builder.withChild(leafChild);
LeafListSchemaNode leafListSchemaNode = (LeafListSchemaNode) getSchemaNode(schema, "test", "leafList");
- LeafSetNode<Integer> leafList = Builders.<Integer> leafSetBuilder(leafListSchemaNode).withChildValue(1)
- .withChild(Builders.<Integer> leafSetEntryBuilder(leafListSchemaNode).withValue(3).build()).build();
+ LeafSetNode<Integer> leafList = Builders.<Integer>leafSetBuilder(leafListSchemaNode).withChildValue(1)
+ .withChild(Builders.<Integer>leafSetEntryBuilder(leafListSchemaNode).withValue(3).build()).build();
builder.withChild(leafList);
ListSchemaNode listSchema = (ListSchemaNode) getSchemaNode(schema, "test", "list");
"containerInList");
MapEntryNode listChild1 = Builders.mapEntryBuilder(listSchema)
- .withChild(Builders.<Integer> leafBuilder(uint32InListSchemaNode).withValue(1).build())
+ .withChild(Builders.<Integer>leafBuilder(uint32InListSchemaNode).withValue(1).build())
.withChild(Builders.containerBuilder(containerInListSchemaNode).build()).build();
MapNode list = ImmutableMapNodeSchemaAwareBuilder.create(listSchema).withChild(listChild1).build();
builder.withChild(list);
LeafSchemaNode augmentUint32SchemaNode = (LeafSchemaNode) getSchemaNode(schema, "test", "augmentUint32");
- AugmentationSchema augmentationSchema = getAugmentationSchemaForChild(containerNode,
+ AugmentationSchemaNode augmentationSchema = getAugmentationSchemaForChild(containerNode,
augmentUint32SchemaNode.getQName());
AugmentationNode augmentation = Builders.augmentationBuilder(augmentationSchema)
- .withChild(Builders.<Integer> leafBuilder(augmentUint32SchemaNode).withValue(11).build()).build();
+ .withChild(Builders.<Integer>leafBuilder(augmentUint32SchemaNode).withValue(11).build()).build();
builder.withChild(augmentation);
// This should fail with schema, since the leaf comes from augmentation
- // builder.withChild(ImmutableLeafNodeSchemaAwareBuilder.<Integer>get(augmentUint32SchemaNode).withValue(11).build());
+ // builder.withChild(ImmutableLeafNodeSchemaAwareBuilder.<Integer>get(augmentUint32SchemaNode).withValue(11)
+ // .build());
LeafSchemaNode augumentString1SchemaNode = (LeafSchemaNode) getSchemaNode(schema, "test", "augmentString1");
LeafSchemaNode augumentString2SchemaNode = (LeafSchemaNode) getSchemaNode(schema, "test", "augmentString2");
ChoiceSchemaNode choice1SchemaNode = (ChoiceSchemaNode) getSchemaNode(schema, "test", "choice");
ChoiceNode choice = ImmutableChoiceNodeSchemaAwareBuilder.create(choice1SchemaNode)
- .withChild(Builders.<String> leafBuilder(augumentString1SchemaNode).withValue("case1").build())
+ .withChild(Builders.<String>leafBuilder(augumentString1SchemaNode).withValue("case1").build())
// This should fail, since child node belongs to different case
// .withChild(Builders.<String>leafBuilder(augumentString2SchemaNode).withValue("case2")
// .build())
// .build());
}
- private static AugmentationSchema getAugmentationSchemaForChild(final ContainerSchemaNode containerNode,
- final QName qName) {
- for (AugmentationSchema augmentationSchema : containerNode.getAvailableAugmentations()) {
- if (augmentationSchema.getDataChildByName(qName) != null) {
+ private static AugmentationSchemaNode getAugmentationSchemaForChild(final ContainerSchemaNode containerNode,
+ final QName qname) {
+ for (AugmentationSchemaNode augmentationSchema : containerNode.getAvailableAugmentations()) {
+ if (augmentationSchema.findDataChildByName(qname).isPresent()) {
return augmentationSchema;
}
}
}
private static QName getQName(final String localName) {
- String namespace = "namespace";
- return new QName(URI.create(namespace), localName);
+ return QName.create(URI.create("namespace"), localName);
}
private static NodeIdentifier getNodeIdentifier(final String localName) {
final String childNodeName) {
for (Module module : context.getModules()) {
if (module.getName().equals(moduleName)) {
- DataSchemaNode found = findChildNode(module.getChildNodes(), childNodeName);
- Preconditions.checkState(found != null, "Unable to find %s", childNodeName);
+ DataSchemaNode found = findChildNode(module, childNodeName);
+ checkState(found != null, "Unable to find %s", childNodeName);
return found;
}
}
throw new IllegalStateException("Unable to find child node " + childNodeName);
}
- private static DataSchemaNode findChildNode(final Iterable<DataSchemaNode> children, final String name) {
- List<DataNodeContainer> containers = Lists.newArrayList();
-
- for (DataSchemaNode dataSchemaNode : children) {
+ private static DataSchemaNode findChildNode(final DataNodeContainer container, final String name) {
+ for (DataSchemaNode dataSchemaNode : container.getChildNodes()) {
if (dataSchemaNode.getQName().getLocalName().equals(name)) {
return dataSchemaNode;
}
if (dataSchemaNode instanceof DataNodeContainer) {
- containers.add((DataNodeContainer) dataSchemaNode);
+ DataSchemaNode retVal = findChildNode((DataNodeContainer) dataSchemaNode, name);
+ if (retVal != null) {
+ return retVal;
+ }
} else if (dataSchemaNode instanceof ChoiceSchemaNode) {
- containers.addAll(((ChoiceSchemaNode) dataSchemaNode).getCases());
+ for (CaseSchemaNode caseNode : ((ChoiceSchemaNode) dataSchemaNode).getCases().values()) {
+ DataSchemaNode retVal = findChildNode(caseNode, name);
+ if (retVal != null) {
+ return retVal;
+ }
+ }
}
}
-
- for (DataNodeContainer container : containers) {
- DataSchemaNode retVal = findChildNode(container.getChildNodes(), name);
- if (retVal != null) {
- return retVal;
- }
- }
-
return null;
}
}
Code Review / yangtools.git / blobdiff