X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fbuilder%2Fimpl%2FAugmentationSchemaBuilderImpl.java;h=c2e17c9b69837d079ba67955bcc9728b6efbdf24;hb=42abb28b99a02f9580f4676ce5c315628e5bcd24;hp=0ef1e4eba962bf6bb3f79f425496239a8b679ba8;hpb=e98a1027fca4e4b27c0e7e00a3723993935c34ad;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java index 0ef1e4eba9..c2e17c9b69 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/AugmentationSchemaBuilderImpl.java @@ -7,111 +7,92 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import org.opendaylight.yangtools.yang.common.QName; +import com.google.common.collect.ImmutableList; +import java.util.Objects; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; -import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -import org.opendaylight.yangtools.yang.model.api.Status; -import org.opendaylight.yangtools.yang.model.api.TypeDefinition; -import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; -import org.opendaylight.yangtools.yang.model.api.UsesNode; import org.opendaylight.yangtools.yang.model.util.RevisionAwareXPathImpl; -import org.opendaylight.yangtools.yang.parser.builder.api.AbstractDataNodeContainerBuilder; import org.opendaylight.yangtools.yang.parser.builder.api.AugmentationSchemaBuilder; -import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder; -import org.opendaylight.yangtools.yang.parser.builder.api.GroupingBuilder; -import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder; -import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder; -import org.opendaylight.yangtools.yang.parser.util.Comparators; -import org.opendaylight.yangtools.yang.parser.util.ParserUtils; -import org.opendaylight.yangtools.yang.parser.util.YangParseException; - -public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContainerBuilder implements - AugmentationSchemaBuilder { - private boolean built; - private final AugmentationSchemaImpl instance; +import org.opendaylight.yangtools.yang.parser.builder.api.Builder; +import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; +import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainerBuilder; +/** + * @deprecated Pre-Beryllium implementation, scheduled for removal. + */ +@Deprecated +public final class AugmentationSchemaBuilderImpl extends AbstractDocumentedDataNodeContainerBuilder implements AugmentationSchemaBuilder { + private final int order; + private AugmentationSchemaImpl instance; private String whenCondition; private final String augmentTargetStr; - private SchemaPath targetPath; - private SchemaPath targetNodeSchemaPath; + private final SchemaPath targetPath; private boolean resolved; + private boolean unsupportedTarget = false; + + private AugmentationSchemaBuilder copyOf; - public AugmentationSchemaBuilderImpl(final String moduleName, final int line, final String augmentTargetStr) { + public AugmentationSchemaBuilderImpl(final String moduleName, final int line, final String augmentTargetStr, + final SchemaPath targetPath, final int order) { super(moduleName, line, null); + this.order = order; this.augmentTargetStr = augmentTargetStr; - targetPath = ParserUtils.parseXPathString(augmentTargetStr); - instance = new AugmentationSchemaImpl(targetPath); + this.targetPath = targetPath; } @Override - public Set getGroupings() { - return Collections.emptySet(); + protected String getStatementName() { + return "augment"; } @Override - public Set getGroupingBuilders() { - return Collections.emptySet(); - } - - @Override - public void addGrouping(GroupingBuilder grouping) { - throw new YangParseException(moduleName, line, "augment can not contains grouping statement"); + public SchemaPath getPath() { + return targetPath; } @Override - public SchemaPath getPath() { - return targetNodeSchemaPath; + public SchemaPath getTargetPath() { + return targetPath; } @Override public AugmentationSchema build() { - if (!built) { - instance.setTargetPath(targetNodeSchemaPath); + if (instance != null) { + return instance; + } - RevisionAwareXPath whenStmt; - if (whenCondition == null) { - whenStmt = null; - } else { - whenStmt = new RevisionAwareXPathImpl(whenCondition, false); - } - instance.setWhenCondition(whenStmt); + buildChildren(); - // CHILD NODES - for (DataSchemaNodeBuilder node : addedChildNodes) { - DataSchemaNode child = node.build(); - childNodes.put(child.getQName(), child); - } - instance.addChildNodes(childNodes); + instance = new AugmentationSchemaImpl(targetPath, order,this); - // USES - for (UsesNodeBuilder builder : addedUsesNodes) { - usesNodes.add(builder.build()); - } - instance.addUses(usesNodes); + Builder parent = getParent(); + if (parent instanceof ModuleBuilder) { + ModuleBuilder moduleBuilder = (ModuleBuilder) parent; + instance.namespace = moduleBuilder.getNamespace(); + instance.revision = moduleBuilder.getRevision(); + } - // UNKNOWN NODES - for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { - unknownNodes.add(b.build()); - } - Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP); - instance.addUnknownSchemaNodes(unknownNodes); + if (copyOf != null) { + instance.setCopyOf(copyOf.build()); + } + + RevisionAwareXPath whenStmt; + if (whenCondition == null) { + whenStmt = null; + } else { + whenStmt = new RevisionAwareXPathImpl(whenCondition, false); + } + instance.whenCondition = whenStmt; - built = true; + // UNKNOWN NODES + for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { + unknownNodes.add(b.build()); } + instance.unknownNodes = ImmutableList.copyOf(unknownNodes); + return instance; } @@ -121,58 +102,36 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain } @Override - public void setResolved(boolean resolved) { + public void setResolved(final boolean resolved) { this.resolved = resolved; } - public String getWhenCondition() { - return whenCondition; - } - - public void addWhenCondition(String whenCondition) { - this.whenCondition = whenCondition; - } - - @Override - public Set getTypeDefinitionBuilders() { - return Collections.emptySet(); - } - + /** + * Set true if target of augment is unsupported (e.g. node in body of extension). + * In such case, augmentation is skipped and AugmentationSchema is not built. + */ @Override - public void addTypedef(TypeDefinitionBuilder type) { - throw new YangParseException(moduleName, line, "Augmentation can not contains typedef statement."); + public void setUnsupportedTarget(final boolean unsupportedTarget) { + this.unsupportedTarget = unsupportedTarget; } + /** + * Return true if target of augment is unsupported (e.g. node in body of extension). + * In such case, augmentation is skipped and AugmentationSchema is not built. + */ @Override - public String getDescription() { - return instance.description; + public boolean isUnsupportedTarget() { + return unsupportedTarget; } @Override - public void setDescription(final String description) { - instance.description = description; - } - - @Override - public String getReference() { - return instance.reference; - } - - @Override - public void setReference(final String reference) { - instance.reference = reference; - } - - @Override - public Status getStatus() { - return instance.status; + public String getWhenCondition() { + return whenCondition; } @Override - public void setStatus(Status status) { - if (status != null) { - instance.status = status; - } + public void addWhenCondition(final String whenCondition) { + this.whenCondition = whenCondition; } @Override @@ -181,32 +140,22 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain } @Override - public SchemaPath getTargetPath() { - return targetPath; - } - - @Override - public SchemaPath getTargetNodeSchemaPath() { - return targetNodeSchemaPath; - } - - @Override - public void setTargetNodeSchemaPath(SchemaPath path) { - this.targetNodeSchemaPath = path; + public int getOrder() { + return order; } @Override public int hashCode() { final int prime = 17; int result = 1; - result = prime * result + ((augmentTargetStr == null) ? 0 : augmentTargetStr.hashCode()); - result = prime * result + ((whenCondition == null) ? 0 : whenCondition.hashCode()); - result = prime * result + ((addedChildNodes == null) ? 0 : addedChildNodes.hashCode()); + result = prime * result + Objects.hashCode(augmentTargetStr); + result = prime * result + Objects.hashCode(whenCondition); + result = prime * result + getChildNodeBuilders().hashCode(); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -231,192 +180,18 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain } else if (!whenCondition.equals(other.whenCondition)) { return false; } - if (addedChildNodes == null) { - if (other.addedChildNodes != null) { - return false; - } - } else if (!addedChildNodes.equals(other.addedChildNodes)) { + if (!getChildNodeBuilders().equals(other.getChildNodeBuilders())) { return false; } return true; } + @Override public String toString() { return "augment " + augmentTargetStr; } - private final class AugmentationSchemaImpl implements AugmentationSchema { - private SchemaPath targetPath; - private RevisionAwareXPath whenCondition; - private final Map childNodes = new HashMap<>(); - private final Set uses = new HashSet<>(); - private String description; - private String reference; - private Status status; - private final List unknownNodes = new ArrayList<>(); - - private AugmentationSchemaImpl(SchemaPath targetPath) { - this.targetPath = targetPath; - } - - @Override - public SchemaPath getTargetPath() { - return targetPath; - } - - private void setTargetPath(SchemaPath path) { - this.targetPath = path; - } - - @Override - public RevisionAwareXPath getWhenCondition() { - return whenCondition; - } - - private void setWhenCondition(RevisionAwareXPath whenCondition) { - this.whenCondition = whenCondition; - } - - @Override - public Set getChildNodes() { - final Set result = new TreeSet(Comparators.SCHEMA_NODE_COMP); - result.addAll(childNodes.values()); - return Collections.unmodifiableSet(result); - } - - private void addChildNodes(Map childNodes) { - if (childNodes != null) { - this.childNodes.putAll(childNodes); - } - } - - /** - * Always returns an empty set, because augment can not contains - * grouping statement. - */ - @Override - public Set getGroupings() { - return Collections.emptySet(); - } - - @Override - public Set getUses() { - return Collections.unmodifiableSet(uses); - } - - private void addUses(Set uses) { - if (uses != null) { - this.uses.addAll(uses); - } - } - - /** - * Always returns an empty set, because augment can not contains type - * definitions. - */ - @Override - public Set> getTypeDefinitions() { - return Collections.emptySet(); - } - - @Override - public String getDescription() { - return description; - } - - @Override - public String getReference() { - return reference; - } - - @Override - public Status getStatus() { - return status; - } - - @Override - public List getUnknownSchemaNodes() { - return Collections.unmodifiableList(unknownNodes); - } - - private void addUnknownSchemaNodes(List unknownSchemaNodes) { - if (unknownSchemaNodes != null) { - this.unknownNodes.addAll(unknownSchemaNodes); - } - } - - @Override - public DataSchemaNode getDataChildByName(QName name) { - return childNodes.get(name); - } - - @Override - public DataSchemaNode getDataChildByName(String name) { - DataSchemaNode result = null; - for (Map.Entry entry : childNodes.entrySet()) { - if (entry.getKey().getLocalName().equals(name)) { - result = entry.getValue(); - break; - } - } - return result; - } - - @Override - public int hashCode() { - final int prime = 17; - int result = 1; - result = prime * result + ((targetPath == null) ? 0 : targetPath.hashCode()); - result = prime * result + ((whenCondition == null) ? 0 : whenCondition.hashCode()); - result = prime * result + ((childNodes == null) ? 0 : childNodes.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - AugmentationSchemaImpl other = (AugmentationSchemaImpl) obj; - if (targetPath == null) { - if (other.targetPath != null) { - return false; - } - } else if (!targetPath.equals(other.targetPath)) { - return false; - } - if (whenCondition == null) { - if (other.whenCondition != null) { - return false; - } - } else if (!whenCondition.equals(other.whenCondition)) { - return false; - } - if (childNodes == null) { - if (other.childNodes != null) { - return false; - } - } else if (!childNodes.equals(other.childNodes)) { - return false; - } - return true; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(AugmentationSchemaImpl.class.getSimpleName()); - sb.append("["); - sb.append("targetPath=" + targetPath); - sb.append(", when=" + whenCondition); - sb.append("]"); - return sb.toString(); - } + public void setCopyOf(final AugmentationSchemaBuilder old) { + copyOf = old; } - }