X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fcodec%2FSchemaTracker.java;h=40e86f3ee8e7a5d2adc2e0b9c1f01c0e17cd331d;hb=02d5aa352315929d3c2511b37c049fea89d0a2a7;hp=79463d031951bd648ee8d28494e2b74c91bd7df6;hpb=82af449e4ef07d80490e79484d0402b81009541e;p=yangtools.git diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java index 79463d0319..40e86f3ee8 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/SchemaTracker.java @@ -7,27 +7,35 @@ */ package org.opendaylight.yangtools.yang.data.impl.codec; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import java.io.IOException; import java.util.ArrayDeque; +import java.util.Collection; import java.util.Deque; -import java.util.HashSet; +import java.util.Optional; +import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.yangtools.odlext.model.api.YangModeledAnyxmlSchemaNode; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils; -import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; +import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +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.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -36,7 +44,6 @@ import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -import org.opendaylight.yangtools.yang.model.api.YangModeledAnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.util.EffectiveAugmentationSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,35 +55,43 @@ import org.slf4j.LoggerFactory; @Beta public final class SchemaTracker { private static final Logger LOG = LoggerFactory.getLogger(SchemaTracker.class); - private final Deque schemaStack = new ArrayDeque<>(); + private final Deque schemaStack = new ArrayDeque<>(); private final DataNodeContainer root; - private SchemaTracker(final SchemaContext context, final SchemaPath path) { - SchemaNode current = SchemaUtils.findParentSchemaOnPath(context, path); - Preconditions.checkArgument(current instanceof DataNodeContainer,"Schema path must point to container or list or an rpc input/output. Supplied path %s pointed to: %s",path,current); - root = (DataNodeContainer) current; + private SchemaTracker(final DataNodeContainer root) { + this.root = requireNonNull(root); } /** - * Create a new writer with the specified context as its root. + * Create a new writer with the specified node as its root. * - * @param context Associated {@link SchemaContext}. + * @param root Root node * @return A new {@link NormalizedNodeStreamWriter} */ - public static SchemaTracker create(final SchemaContext context) { - return create(context, SchemaPath.ROOT); + public static @NonNull SchemaTracker create(final DataNodeContainer root) { + return new SchemaTracker(root); } /** - * Create a new writer with the specified context and rooted in the specified schema path + * Create a new writer with the specified context and rooted in the specified schema path. * * @param context Associated {@link SchemaContext} * @param path schema path - * * @return A new {@link NormalizedNodeStreamWriter} */ - public static SchemaTracker create(final SchemaContext context, final SchemaPath path) { - return new SchemaTracker(context, path); + public static @NonNull SchemaTracker create(final SchemaContext context, final SchemaPath path) { + final Collection schemaNodes = SchemaUtils.findParentSchemaNodesOnPath(context, path); + checkArgument(!schemaNodes.isEmpty(), "Unable to find schema node for supplied schema path: %s", path); + if (schemaNodes.size() > 1) { + LOG.warn("More possible schema nodes {} for supplied schema path {}", schemaNodes, path); + } + final Optional current = schemaNodes.stream() + .filter(node -> node instanceof DataNodeContainer).map(DataNodeContainer.class::cast) + .findFirst(); + checkArgument(current.isPresent(), + "Schema path must point to container or list or an rpc input/output. Supplied path %s pointed to: %s", + path, current); + return new SchemaTracker(current.get()); } public Object getParent() { @@ -92,86 +107,95 @@ public final class SchemaTracker { final QName qname = name.getNodeType(); if (parent instanceof DataNodeContainer) { schema = ((DataNodeContainer)parent).getDataChildByName(qname); - - if (schema == null && parent instanceof GroupingDefinition) { - schema = ((GroupingDefinition) parent); - } - - if (schema == null && parent instanceof NotificationDefinition) { - schema = ((NotificationDefinition) parent); + if (schema == null) { + if (parent instanceof GroupingDefinition) { + schema = (GroupingDefinition) parent; + } else if (parent instanceof NotificationDefinition) { + schema = (NotificationDefinition) parent; + } } } else if (parent instanceof ChoiceSchemaNode) { schema = findChildInCases((ChoiceSchemaNode) parent, qname); } else { - throw new IllegalStateException("Unsupported schema type "+ parent.getClass() +" on stack."); + throw new IllegalStateException("Unsupported schema type " + parent.getClass() + " on stack."); } - Preconditions.checkArgument(schema != null, "Could not find schema for node %s in %s", qname, parent); + + checkArgument(schema != null, "Could not find schema for node %s in %s", qname, parent); return schema; } private static SchemaNode findChildInCases(final ChoiceSchemaNode parent, final QName qname) { - DataSchemaNode schema = null; - for (final ChoiceCaseNode caze : parent.getCases()) { - final DataSchemaNode potential = caze.getDataChildByName(qname); - if (potential != null) { - schema = potential; - break; + for (final CaseSchemaNode caze : parent.getCases().values()) { + final Optional potential = caze.findDataChildByName(qname); + if (potential.isPresent()) { + return potential.get(); } } - return schema; + return null; } private static SchemaNode findCaseByChild(final ChoiceSchemaNode parent, final QName qname) { - DataSchemaNode schema = null; - for (final ChoiceCaseNode caze : parent.getCases()) { - final DataSchemaNode potential = caze.getDataChildByName(qname); - if (potential != null) { - schema = caze; - break; + for (final CaseSchemaNode caze : parent.getCases().values()) { + final Optional potential = caze.findDataChildByName(qname); + if (potential.isPresent()) { + return caze; } } - return schema; + return null; } public void startList(final PathArgument name) { final SchemaNode schema = getSchema(name); - Preconditions.checkArgument(schema instanceof ListSchemaNode, "Node %s is not a list", schema.getPath()); + checkArgument(schema instanceof ListSchemaNode, "Node %s is not a list", schema.getPath()); schemaStack.push(schema); } public void startListItem(final PathArgument name) throws IOException { final Object schema = getParent(); - Preconditions.checkArgument(schema instanceof ListSchemaNode, "List item is not appropriate"); - schemaStack.push(schema); + checkArgument(schema instanceof ListSchemaNode, "List item is not appropriate"); + schemaStack.push((ListSchemaNode) schema); } public LeafSchemaNode leafNode(final NodeIdentifier name) throws IOException { final SchemaNode schema = getSchema(name); - Preconditions.checkArgument(schema instanceof LeafSchemaNode, "Node %s is not a leaf", schema.getPath()); + checkArgument(schema instanceof LeafSchemaNode, "Node %s is not a leaf", schema.getPath()); return (LeafSchemaNode) schema; } + public void startLeafNode(final NodeIdentifier name) throws IOException { + schemaStack.push(leafNode(name)); + } + public LeafListSchemaNode startLeafSet(final NodeIdentifier name) { final SchemaNode schema = getSchema(name); - Preconditions.checkArgument(schema instanceof LeafListSchemaNode, "Node %s is not a leaf-list", schema.getPath()); + checkArgument(schema instanceof LeafListSchemaNode, "Node %s is not a leaf-list", schema.getPath()); schemaStack.push(schema); return (LeafListSchemaNode)schema; } - public LeafListSchemaNode leafSetEntryNode() { + public LeafListSchemaNode leafSetEntryNode(final QName qname) { final Object parent = getParent(); + if (parent instanceof LeafListSchemaNode) { + return (LeafListSchemaNode) parent; + } + + final SchemaNode child = SchemaUtils.findDataChildSchemaByQName((SchemaNode) parent, qname); + checkArgument(child instanceof LeafListSchemaNode, + "Node %s is neither a leaf-list nor currently in a leaf-list", child.getPath()); + return (LeafListSchemaNode) child; + } - Preconditions.checkArgument(parent instanceof LeafListSchemaNode, "Not currently in a leaf-list"); - return (LeafListSchemaNode) parent; + public void startLeafSetEntryNode(final NodeWithValue name) { + schemaStack.push(leafSetEntryNode(name.getNodeType())); } public ChoiceSchemaNode startChoiceNode(final NodeIdentifier name) { LOG.debug("Enter choice {}", name); final SchemaNode schema = getSchema(name); - Preconditions.checkArgument(schema instanceof ChoiceSchemaNode, "Node %s is not a choice", schema.getPath()); + checkArgument(schema instanceof ChoiceSchemaNode, "Node %s is not a choice", schema.getPath()); schemaStack.push(schema); return (ChoiceSchemaNode)schema; } @@ -183,7 +207,7 @@ public final class SchemaTracker { boolean isAllowed = schema instanceof ContainerSchemaNode; isAllowed |= schema instanceof NotificationDefinition; - Preconditions.checkArgument(isAllowed, "Node %s is not a container nor a notification", schema.getPath()); + checkArgument(isAllowed, "Node %s is not a container nor a notification", schema.getPath()); schemaStack.push(schema); return schema; @@ -193,43 +217,53 @@ public final class SchemaTracker { LOG.debug("Enter yang modeled anyXml {}", name); final SchemaNode schema = getSchema(name); - Preconditions.checkArgument(schema instanceof YangModeledAnyXmlSchemaNode, - "Node %s is not an yang modeled anyXml.", schema.getPath()); + checkArgument(schema instanceof YangModeledAnyxmlSchemaNode, "Node %s is not an yang modeled anyXml.", + schema.getPath()); - schemaStack.push(((YangModeledAnyXmlSchemaNode) schema).getSchemaOfAnyXmlData()); + schemaStack.push(((YangModeledAnyxmlSchemaNode) schema).getSchemaOfAnyXmlData()); return schema; } - public AugmentationSchema startAugmentationNode(final AugmentationIdentifier identifier) { + public AugmentationSchemaNode startAugmentationNode(final AugmentationIdentifier identifier) { LOG.debug("Enter augmentation {}", identifier); Object parent = getParent(); - Preconditions.checkArgument(parent instanceof AugmentationTarget, "Augmentation not allowed under %s", parent); + checkArgument(parent instanceof AugmentationTarget, "Augmentation not allowed under %s", parent); if (parent instanceof ChoiceSchemaNode) { final QName name = Iterables.get(identifier.getPossibleChildNames(), 0); parent = findCaseByChild((ChoiceSchemaNode) parent, name); } - Preconditions.checkArgument(parent instanceof DataNodeContainer, "Augmentation allowed only in DataNodeContainer",parent); - final AugmentationSchema schema = SchemaUtils.findSchemaForAugment((AugmentationTarget) parent, identifier.getPossibleChildNames()); - final HashSet realChildSchemas = new HashSet<>(); - for (final DataSchemaNode child : schema.getChildNodes()) { - realChildSchemas.add(((DataNodeContainer) parent).getDataChildByName(child.getQName())); - } - final AugmentationSchema resolvedSchema = new EffectiveAugmentationSchema(schema, realChildSchemas); + checkArgument(parent instanceof DataNodeContainer, "Augmentation allowed only in DataNodeContainer", parent); + final AugmentationSchemaNode schema = SchemaUtils.findSchemaForAugment((AugmentationTarget) parent, + identifier.getPossibleChildNames()); + final AugmentationSchemaNode resolvedSchema = EffectiveAugmentationSchema.create(schema, + (DataNodeContainer) parent); schemaStack.push(resolvedSchema); return resolvedSchema; } - public AnyXmlSchemaNode anyxmlNode(final NodeIdentifier name) { + public AnyxmlSchemaNode anyxmlNode(final NodeIdentifier name) { final SchemaNode schema = getSchema(name); + checkArgument(schema instanceof AnyxmlSchemaNode, "Node %s is not anyxml", schema.getPath()); + return (AnyxmlSchemaNode)schema; + } - Preconditions.checkArgument(schema instanceof AnyXmlSchemaNode, "Node %s is not anyxml", schema.getPath()); - return (AnyXmlSchemaNode)schema; + public void startAnyxmlNode(final NodeIdentifier name) { + schemaStack.push(anyxmlNode(name)); + } + + public AnydataSchemaNode anydataNode(final NodeIdentifier name) { + final SchemaNode schema = getSchema(name); + checkArgument(schema instanceof AnydataSchemaNode, "Node %s is not anydata", schema.getPath()); + return (AnydataSchemaNode)schema; + } + + public void startAnydataNode(final NodeIdentifier name) { + schemaStack.push(anydataNode(name)); } public Object endNode() { return schemaStack.pop(); } - }