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%2Fschema%2FSchemaUtils.java;h=1b031b64882cc368b8e843840e7ef3c11bcc8714;hb=02b4c77462a4fafd2e3fd0a67dd563e984566913;hp=7d4210ab229202b70602fbfb5894a310fa8fa3c9;hpb=641f1d81b62002fc06cb60055fa5c4a7cf53863a;p=yangtools.git diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java index 7d4210ab22..1b031b6488 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/SchemaUtils.java @@ -7,12 +7,12 @@ */ package org.opendaylight.yangtools.yang.data.impl.schema; -import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.model.api.ActionNodeContainer; 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.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -65,7 +65,7 @@ public final class SchemaUtils { schema = dsn; } } else if (dsn instanceof ChoiceSchemaNode) { - for (final ChoiceCaseNode choiceCase : ((ChoiceSchemaNode) dsn).getCases()) { + for (final CaseSchemaNode choiceCase : ((ChoiceSchemaNode) dsn).getCases().values()) { final DataSchemaNode dataChildByName = choiceCase.getDataChildByName(qname); if (dataChildByName != null) { @@ -114,13 +114,13 @@ public final class SchemaUtils { public static DataSchemaNode findSchemaForChild(final DataNodeContainer schema, final QName qname, final Iterable childNodes) { final Optional childSchema = findFirstSchema(qname, childNodes); - Preconditions.checkState(childSchema.isPresent(), - "Unknown child(ren) node(s) detected, identified by: %s, in: %s", qname, schema); + checkState(childSchema.isPresent(), "Unknown child(ren) node(s) detected, identified by: %s, in: %s", qname, + schema); return childSchema.get(); } public static DataSchemaNode findSchemaForChild(final ChoiceSchemaNode schema, final QName childPartialQName) { - for (final ChoiceCaseNode choiceCaseNode : schema.getCases()) { + for (final CaseSchemaNode choiceCaseNode : schema.getCases().values()) { final Optional childSchema = findFirstSchema(childPartialQName, choiceCaseNode.getChildNodes()); if (childSchema.isPresent()) { @@ -136,24 +136,21 @@ public final class SchemaUtils { public static AugmentationSchemaNode findSchemaForAugment(final AugmentationTarget schema, final Set qnames) { final Optional schemaForAugment = findAugment(schema, qnames); - Preconditions.checkState(schemaForAugment.isPresent(), - "Unknown augmentation node detected, identified by: %s, in: %s", qnames, schema); + checkState(schemaForAugment.isPresent(), "Unknown augmentation node detected, identified by: %s, in: %s", + qnames, schema); return schemaForAugment.get(); } public static AugmentationSchemaNode findSchemaForAugment(final ChoiceSchemaNode schema, final Set qnames) { - Optional schemaForAugment = Optional.empty(); - - for (final ChoiceCaseNode choiceCaseNode : schema.getCases()) { - schemaForAugment = findAugment(choiceCaseNode, qnames); + for (final CaseSchemaNode choiceCaseNode : schema.getCases().values()) { + final Optional schemaForAugment = findAugment(choiceCaseNode, qnames); if (schemaForAugment.isPresent()) { - break; + return schemaForAugment.get(); } } - Preconditions.checkState(schemaForAugment.isPresent(), - "Unknown augmentation node detected, identified by: %s, in: %s", qnames, schema); - return schemaForAugment.get(); + throw new IllegalStateException(String.format("Unknown augmentation node detected, identified by: %s, in: %s", + qnames, schema)); } private static Optional findAugment(final AugmentationTarget schema, @@ -191,7 +188,7 @@ public final class SchemaUtils { continue; } - for (final ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) childSchema).getCases()) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) childSchema).getCases().values()) { for (final QName qname : getChildNodesRecursive(choiceCaseNode)) { mappedChoices.put(qname, (ChoiceSchemaNode) childSchema); } @@ -247,12 +244,12 @@ public final class SchemaUtils { final AugmentationSchemaNode mostTopAugmentation = augments.get(child.getQName()); // recursively add all child nodes in case of augment, case and choice - if (child instanceof AugmentationSchemaNode || child instanceof ChoiceCaseNode) { + if (child instanceof AugmentationSchemaNode || child instanceof CaseSchemaNode) { for (final QName qname : getChildNodesRecursive((DataNodeContainer) child)) { childNodesToAugmentation.put(qname, mostTopAugmentation); } } else if (child instanceof ChoiceSchemaNode) { - for (final ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) child).getCases()) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) child).getCases().values()) { for (final QName qname : getChildNodesRecursive(choiceCaseNode)) { childNodesToAugmentation.put(qname, mostTopAugmentation); } @@ -265,7 +262,7 @@ public final class SchemaUtils { // Choice Node has to map child nodes from all its cases if (schema instanceof ChoiceSchemaNode) { - for (final ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) schema).getCases()) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) schema).getCases().values()) { if (!augments.containsKey(choiceCaseNode.getQName())) { continue; } @@ -290,10 +287,10 @@ public final class SchemaUtils { for (final DataSchemaNode childSchema : nodeContainer.getChildNodes()) { if (childSchema instanceof ChoiceSchemaNode) { - for (final ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) childSchema).getCases()) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) childSchema).getCases().values()) { allChildNodes.addAll(getChildNodesRecursive(choiceCaseNode)); } - } else if (childSchema instanceof AugmentationSchemaNode || childSchema instanceof ChoiceCaseNode) { + } else if (childSchema instanceof AugmentationSchemaNode || childSchema instanceof CaseSchemaNode) { allChildNodes.addAll(getChildNodesRecursive((DataNodeContainer) childSchema)); } else { allChildNodes.add(childSchema.getQName()); @@ -325,7 +322,7 @@ public final class SchemaUtils { final Set realChildNodes = new HashSet<>(); if (targetSchema instanceof ChoiceSchemaNode) { for (final DataSchemaNode dataSchemaNode : augmentSchema.getChildNodes()) { - for (final ChoiceCaseNode choiceCaseNode : ((ChoiceSchemaNode) targetSchema).getCases()) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) targetSchema).getCases().values()) { if (getChildNodesRecursive(choiceCaseNode).contains(dataSchemaNode.getQName())) { realChildNodes.add(choiceCaseNode.getDataChildByName(dataSchemaNode.getQName())); } @@ -346,9 +343,9 @@ public final class SchemaUtils { return realChildNodes; } - public static Optional detectCase(final ChoiceSchemaNode schema, + public static Optional detectCase(final ChoiceSchemaNode schema, final DataContainerChild child) { - for (final ChoiceCaseNode choiceCaseNode : schema.getCases()) { + for (final CaseSchemaNode choiceCaseNode : schema.getCases().values()) { if (child instanceof AugmentationNode && belongsToCaseAugment(choiceCaseNode, (AugmentationIdentifier) child.getIdentifier())) { return Optional.of(choiceCaseNode); @@ -360,7 +357,7 @@ public final class SchemaUtils { return Optional.empty(); } - public static boolean belongsToCaseAugment(final ChoiceCaseNode caseNode, + public static boolean belongsToCaseAugment(final CaseSchemaNode caseNode, final AugmentationIdentifier childToProcess) { for (final AugmentationSchemaNode augmentationSchema : caseNode.getAvailableAugmentations()) { @@ -401,8 +398,8 @@ public final class SchemaUtils { } public static AugmentationIdentifier getNodeIdentifierForAugmentation(final AugmentationSchemaNode schema) { - final Collection qnames = Collections2.transform(schema.getChildNodes(), DataSchemaNode::getQName); - return new AugmentationIdentifier(ImmutableSet.copyOf(qnames)); + return new AugmentationIdentifier(ImmutableSet.copyOf(Collections2.transform(schema.getChildNodes(), + DataSchemaNode::getQName))); } /** @@ -418,43 +415,17 @@ public final class SchemaUtils { * @return schema node on path */ public static SchemaNode findDataParentSchemaOnPath(final SchemaContext schemaContext, final SchemaPath path) { - SchemaNode current = Preconditions.checkNotNull(schemaContext); + SchemaNode current = requireNonNull(schemaContext); for (final QName qname : path.getPathFromRoot()) { current = findDataChildSchemaByQName(current, qname); } return current; } - /** - * Finds schema node for given path in schema context. This method performs lookup in both the namespace - * of groupings and the namespace of all leafs, leaf-lists, lists, containers, choices, rpcs, actions, - * notifications, anydatas and anyxmls according to Rfc6050/Rfc7950 section 6.2.1. - * - *

- * This method is deprecated, because name conflicts can occur between the namespace of groupings and namespace - * of data nodes and in consequence lookup could be ambiguous. - * - * @param schemaContext - * schema context - * @param path - * path - * @return schema node on path - * - * @deprecated Use {@link #findParentSchemaNodesOnPath(SchemaContext, SchemaPath)} instead. - */ - @Deprecated - public static SchemaNode findParentSchemaOnPath(final SchemaContext schemaContext, final SchemaPath path) { - SchemaNode current = Preconditions.checkNotNull(schemaContext); - for (final QName qname : path.getPathFromRoot()) { - current = findChildSchemaByQName(current, qname); - } - return current; - } - /** * Find child data schema node identified by its QName within a provided schema node. This method performs lookup * in the namespace of all leafs, leaf-lists, lists, containers, choices, rpcs, actions, notifications, anydatas - * and anyxmls according to Rfc6050/Rfc7950 section 6.2.1. + * and anyxmls according to RFC6050/RFC7950 section 6.2.1. * * @param node * schema node @@ -466,66 +437,35 @@ public final class SchemaUtils { */ @Nullable public static SchemaNode findDataChildSchemaByQName(final SchemaNode node, final QName qname) { - SchemaNode child = null; if (node instanceof DataNodeContainer) { - child = ((DataNodeContainer) node).getDataChildByName(qname); + SchemaNode child = ((DataNodeContainer) node).getDataChildByName(qname); if (child == null && node instanceof SchemaContext) { - child = tryFindRpc((SchemaContext) node, qname).orElse(null); + child = tryFind(((SchemaContext) node).getOperations(), qname).orElse(null); } if (child == null && node instanceof NotificationNodeContainer) { - child = tryFindNotification((NotificationNodeContainer) node, qname).orElse(null); + child = tryFind(((NotificationNodeContainer) node).getNotifications(), qname).orElse(null); } if (child == null && node instanceof ActionNodeContainer) { - child = tryFindAction((ActionNodeContainer) node, qname).orElse(null); + child = tryFind(((ActionNodeContainer) node).getActions(), qname).orElse(null); } - } else if (node instanceof ChoiceSchemaNode) { - child = ((ChoiceSchemaNode) node).getCaseNodeByName(qname); - } else if (node instanceof RpcDefinition) { + + return child; + } + if (node instanceof ChoiceSchemaNode) { + return ((ChoiceSchemaNode) node).getCaseNodeByName(qname); + } + if (node instanceof RpcDefinition) { switch (qname.getLocalName()) { case "input": - child = ((RpcDefinition) node).getInput(); - break; + return ((RpcDefinition) node).getInput(); case "output": - child = ((RpcDefinition) node).getOutput(); - break; + return ((RpcDefinition) node).getOutput(); default: - child = null; - break; + return null; } - } else { - throw new IllegalArgumentException(String.format("Schema node %s does not allow children.", node)); - } - - return child; - } - - /** - * Find child schema node identified by its QName within a provided schema node. This method performs lookup - * in both the namespace of groupings and the namespace of all leafs, leaf-lists, lists, containers, choices, rpcs, - * actions, notifications, anydatas and anyxmls according to RFC6050/RFC7950 section 6.2.1. - * - *

- * This method is deprecated, because name conflicts can occur between the namespace of groupings and namespace - * of data nodes and in consequence lookup could be ambiguous. - * - * @param node - * schema node - * @param qname - * QName - * @return child schema node - * @throws IllegalArgumentException - * if the schema node does not allow children - * - * @deprecated Use {@link #findChildSchemaNodesByQName(SchemaNode, QName)} instead. - */ - @Deprecated - public static SchemaNode findChildSchemaByQName(final SchemaNode node, final QName qname) { - SchemaNode child = findDataChildSchemaByQName(node, qname); - if (child == null && node instanceof DataNodeContainer) { - child = tryFindGroupings((DataNodeContainer) node, qname).orElse(null); } - return child; + throw new IllegalArgumentException(String.format("Schema node %s does not allow children.", node)); } /** @@ -548,7 +488,7 @@ public final class SchemaUtils { final SchemaPath path) { final Collection currentNodes = new ArrayList<>(); final Collection childNodes = new ArrayList<>(); - currentNodes.add(Preconditions.checkNotNull(schemaContext)); + currentNodes.add(requireNonNull(schemaContext)); for (final QName qname : path.getPathFromRoot()) { for (final SchemaNode current : currentNodes) { childNodes.addAll(findChildSchemaNodesByQName(current, qname)); @@ -586,40 +526,12 @@ public final class SchemaUtils { childNodes.add(dataNode); } if (node instanceof DataNodeContainer) { - tryFindGroupings((DataNodeContainer) node, qname).ifPresent(childNodes::add); + tryFind(((DataNodeContainer) node).getGroupings(), qname).ifPresent(childNodes::add); } - return childNodes.isEmpty() ? Collections.emptyList() : ImmutableList.copyOf(childNodes); - } - - private static Optional tryFindGroupings(final DataNodeContainer dataNodeContainer, final QName qname) { - return Optional - .ofNullable(Iterables.find(dataNodeContainer.getGroupings(), new SchemaNodePredicate(qname), null)); - } - - private static Optional tryFindRpc(final SchemaContext ctx, final QName qname) { - return Optional.ofNullable(Iterables.find(ctx.getOperations(), new SchemaNodePredicate(qname), null)); - } - - private static Optional tryFindNotification(final NotificationNodeContainer notificationContanier, - final QName qname) { - return Optional.ofNullable( - Iterables.find(notificationContanier.getNotifications(), new SchemaNodePredicate(qname), null)); + return childNodes.isEmpty() ? ImmutableList.of() : ImmutableList.copyOf(childNodes); } - private static Optional tryFindAction(final ActionNodeContainer actionContanier, final QName qname) { - return Optional.ofNullable(Iterables.find(actionContanier.getActions(), new SchemaNodePredicate(qname), null)); - } - - private static final class SchemaNodePredicate implements Predicate { - private final QName qname; - - SchemaNodePredicate(final QName qname) { - this.qname = qname; - } - - @Override - public boolean apply(final SchemaNode input) { - return input.getQName().equals(qname); - } + private static Optional tryFind(final Collection nodes, final QName qname) { + return nodes.stream().filter(node -> qname.equals(node.getQName())).findFirst(); } }