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=5d93a06579bea94c8ead4cea608b422dfab68b78;hb=0eb60011b52e4e56c62b47a36eb334f2c3b3ad6a;hp=ceae0f73a404508028ebcd3847bf5a851c70f0ce;hpb=649f7af520af7c512324ea387921667d3e6ac7e1;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 ceae0f73a4..5d93a06579 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,133 +7,96 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; +import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableList; +import java.net.URI; +import java.util.Date; +import java.util.Iterator; +import java.util.List; import org.opendaylight.yangtools.yang.common.QName; 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.NamespaceRevisionAware; 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.AbstractDocumentedDataNodeContainer; +import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainerBuilder; + +public final class AugmentationSchemaBuilderImpl extends AbstractDocumentedDataNodeContainerBuilder implements AugmentationSchemaBuilder { + private final int order; + private AugmentationSchemaImpl instance; private String whenCondition; - private String description; - private String reference; - private Status status = Status.CURRENT; private final String augmentTargetStr; - private SchemaPath dirtyAugmentTarget; - private SchemaPath finalAugmentTarget; + private final SchemaPath targetPath; - private final Set usesNodes = new HashSet(); private boolean resolved; + private AugmentationSchemaBuilder copyOf; - private static final SchemaPath PATH = new SchemaPath(Collections. emptyList(), true); - - 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; - final SchemaPath targetPath = ParserUtils.parseXPathString(augmentTargetStr); - dirtyAugmentTarget = targetPath; - instance = new AugmentationSchemaImpl(targetPath); - } - - @Override - public Set getGroupings() { - return Collections.emptySet(); - } - - @Override - public Set getGroupingBuilders() { - return Collections.emptySet(); - } - - @Override - public void addGrouping(GroupingBuilder grouping) { - throw new YangParseException(moduleName, line, "augment can not contains grouping statement"); + this.targetPath = targetPath; } @Override - public Set getUsesNodes() { - return usesNodes; + protected String getStatementName() { + return "augment"; } @Override - public void addUsesNode(UsesNodeBuilder usesBuilder) { - usesNodes.add(usesBuilder); + public SchemaPath getPath() { + return targetPath; } @Override - public SchemaPath getPath() { - return PATH; + public SchemaPath getTargetPath() { + return targetPath; } @Override public AugmentationSchema build() { - if (!built) { - instance.setDescription(description); - instance.setReference(reference); - instance.setStatus(status); - instance.setTargetPath(finalAugmentTarget); + if (instance != null) { + return instance; + } - RevisionAwareXPath whenStmt; - if (whenCondition == null) { - whenStmt = null; - } else { - whenStmt = new RevisionAwareXPathImpl(whenCondition, false); - } - instance.setWhenCondition(whenStmt); + buildChildren(); - // CHILD NODES - final Map childs = new TreeMap(Comparators.QNAME_COMP); - for (DataSchemaNodeBuilder node : addedChildNodes) { - childs.put(node.getQName(), node.build()); - } - instance.setChildNodes(childs); + instance = new AugmentationSchemaImpl(targetPath, order,this); - // USES - final Set usesNodeDefinitions = new HashSet(); - for (UsesNodeBuilder builder : usesNodes) { - usesNodeDefinitions.add(builder.build()); - } - instance.setUses(usesNodeDefinitions); + Builder parent = getParent(); + if (parent instanceof ModuleBuilder) { + ModuleBuilder moduleBuilder = (ModuleBuilder) parent; + instance.namespace = moduleBuilder.getNamespace(); + instance.revision = moduleBuilder.getRevision(); + } - // UNKNOWN NODES - List unknownNodes = new ArrayList(); - for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { - unknownNodes.add(b.build()); - } - Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP); - instance.setUnknownSchemaNodes(unknownNodes); + if (copyOf != null) { + instance.setCopyOf(copyOf.build()); + } - built = true; + RevisionAwareXPath whenStmt; + if (whenCondition == null) { + whenStmt = null; + } else { + whenStmt = new RevisionAwareXPathImpl(whenCondition, false); + } + instance.whenCondition = whenStmt; + + // UNKNOWN NODES + for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { + unknownNodes.add(b.build()); } + instance.unknownNodes = ImmutableList.copyOf(unknownNodes); + return instance; } @@ -143,73 +106,28 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain } @Override - public void setResolved(boolean resolved) { + public void setResolved(final boolean resolved) { this.resolved = resolved; } + @Override public String getWhenCondition() { return whenCondition; } - public void addWhenCondition(String whenCondition) { - this.whenCondition = whenCondition; - } - - @Override - public Set getTypeDefinitionBuilders() { - return Collections.emptySet(); - } - - @Override - public void addTypedef(TypeDefinitionBuilder type) { - throw new YangParseException(moduleName, line, "Augmentation can not contains typedef statement."); - } - - @Override - public String getDescription() { - return description; - } - - @Override - public void setDescription(String description) { - this.description = description; - } - - @Override - public String getReference() { - return reference; - } - @Override - public void setReference(String reference) { - this.reference = reference; - } - - @Override - public Status getStatus() { - return status; - } - - @Override - public void setStatus(Status status) { - if (status != null) { - this.status = status; - } - } - - @Override - public SchemaPath getTargetPath() { - return dirtyAugmentTarget; + public void addWhenCondition(final String whenCondition) { + this.whenCondition = whenCondition; } @Override - public void setTargetPath(SchemaPath path) { - this.finalAugmentTarget = path; + public String getTargetPathAsString() { + return augmentTargetStr; } @Override - public String getTargetPathAsString() { - return augmentTargetStr; + public int getOrder() { + return order; } @Override @@ -218,12 +136,12 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain int result = 1; result = prime * result + ((augmentTargetStr == null) ? 0 : augmentTargetStr.hashCode()); result = prime * result + ((whenCondition == null) ? 0 : whenCondition.hashCode()); - result = prime * result + ((childNodes == null) ? 0 : childNodes.hashCode()); + result = prime * result + getChildNodeBuilders().hashCode(); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -248,119 +166,54 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain } else if (!whenCondition.equals(other.whenCondition)) { return false; } - if (childNodes == null) { - if (other.childNodes != null) { - return false; - } - } else if (!childNodes.equals(other.childNodes)) { + 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 Map childNodes = Collections.emptyMap(); - private Set uses = Collections.emptySet(); - private String description; - private String reference; - private Status status; - private List unknownNodes = Collections.emptyList(); - - 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 result; - } - - private void setChildNodes(Map childNodes) { - if (childNodes != null) { - this.childNodes = childNodes; - } - } + public void setCopyOf(final AugmentationSchemaBuilder old) { + copyOf = old; + } - /** - * Always returns an empty set, because augment can not contains - * grouping statement. - */ - @Override - public Set getGroupings() { - return Collections.emptySet(); - } + private static final class AugmentationSchemaImpl extends AbstractDocumentedDataNodeContainer implements AugmentationSchema, NamespaceRevisionAware, Comparable { + private final int order; + private final SchemaPath targetPath; + private RevisionAwareXPath whenCondition; - @Override - public Set getUses() { - return uses; - } + private URI namespace; + private Date revision; + private ImmutableList unknownNodes; + private AugmentationSchema copyOf; - private void setUses(Set uses) { - if (uses != null) { - this.uses = uses; - } + public AugmentationSchemaImpl(final SchemaPath targetPath, final int order, final AugmentationSchemaBuilderImpl builder) { + super(builder); + this.targetPath = targetPath; + this.order = order; } - /** - * Always returns an empty set, because augment can not contains type - * definitions. - */ - @Override - public Set> getTypeDefinitions() { - return Collections.emptySet(); + public void setCopyOf(final AugmentationSchema build) { + this.copyOf = build; } @Override - public String getDescription() { - return description; - } - - private void setDescription(String description) { - this.description = description; + public Optional getOriginalDefinition() { + return Optional.fromNullable(this.copyOf); } @Override - public String getReference() { - return reference; - } - - private void setReference(String reference) { - this.reference = reference; + public SchemaPath getTargetPath() { + return targetPath; } @Override - public Status getStatus() { - return status; - } - - private void setStatus(Status status) { - this.status = status; + public RevisionAwareXPath getWhenCondition() { + return whenCondition; } @Override @@ -368,27 +221,14 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain return unknownNodes; } - private void setUnknownSchemaNodes(List unknownSchemaNodes) { - if (unknownSchemaNodes != null) { - this.unknownNodes = unknownSchemaNodes; - } - } - @Override - public DataSchemaNode getDataChildByName(QName name) { - return childNodes.get(name); + public URI getNamespace() { + return namespace; } @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; + public Date getRevision() { + return revision; } @Override @@ -397,12 +237,12 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain 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()); + result = prime * result + getChildNodes().hashCode(); return result; } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -427,11 +267,7 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain } else if (!whenCondition.equals(other.whenCondition)) { return false; } - if (childNodes == null) { - if (other.childNodes != null) { - return false; - } - } else if (!childNodes.equals(other.childNodes)) { + if (!getChildNodes().equals(other.getChildNodes())) { return false; } return true; @@ -441,11 +277,31 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain public String toString() { StringBuilder sb = new StringBuilder(AugmentationSchemaImpl.class.getSimpleName()); sb.append("["); - sb.append("targetPath=" + targetPath); - sb.append(", when=" + whenCondition); + sb.append("targetPath=").append(targetPath); + sb.append(", when=").append(whenCondition); sb.append("]"); return sb.toString(); } - } + @Override + public int compareTo(final AugmentationSchemaImpl o) { + checkNotNull(o); + Iterator thisIt = this.targetPath.getPathFromRoot().iterator(); + Iterator otherIt = o.getTargetPath().getPathFromRoot().iterator(); + while (thisIt.hasNext()) { + if (otherIt.hasNext()) { + int comp = thisIt.next().compareTo(otherIt.next()); + if (comp != 0) { + return comp; + } + } else { + return 1; + } + } + if (otherIt.hasNext()) { + return -1; + } + return this.order - o.order; + } + } }