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=3e4abd301dc1602f301e81b2890340ba18b7b3cf;hpb=10ee343b9cdff9609f2f8c6808ac9a85485dff99;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 3e4abd301d..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,84 +7,55 @@ */ package org.opendaylight.yangtools.yang.parser.builder.impl; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.QNameModule; +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.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.Builder; -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.ParserUtils; -import org.opendaylight.yangtools.yang.parser.util.YangParseException; - -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; +import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder; +import org.opendaylight.yangtools.yang.parser.builder.util.AbstractDocumentedDataNodeContainerBuilder; -public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContainerBuilder implements - AugmentationSchemaBuilder { +/** + * @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 String description; - private String reference; - private Status status = Status.CURRENT; - private final String augmentTargetStr; private final SchemaPath targetPath; - private SchemaPath targetNodeSchemaPath; private boolean resolved; + private boolean unsupportedTarget = false; + private AugmentationSchemaBuilder copyOf; - public AugmentationSchemaBuilderImpl(final String moduleName, final int line, final String augmentTargetStr, final int order) { + 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); - } - - @Override - public Set getGroupings() { - return Collections.emptySet(); + this.targetPath = targetPath; } @Override - public Set getGroupingBuilders() { - return Collections.emptySet(); + protected String getStatementName() { + return "augment"; } @Override - public void addGrouping(final GroupingBuilder grouping) { - throw new YangParseException(getModuleName(), grouping.getLine(), "augment can not contains grouping statement"); + public SchemaPath getPath() { + return targetPath; } @Override - public SchemaPath getPath() { - return targetNodeSchemaPath; + public SchemaPath getTargetPath() { + return targetPath; } @Override @@ -93,11 +64,9 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain return instance; } - instance = new AugmentationSchemaImpl(targetPath, order); + buildChildren(); - instance.description = description; - instance.reference = reference; - instance.status = status; + instance = new AugmentationSchemaImpl(targetPath, order,this); Builder parent = getParent(); if (parent instanceof ModuleBuilder) { @@ -106,19 +75,6 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain instance.revision = moduleBuilder.getRevision(); } - if (parent instanceof UsesNodeBuilder) { - final ModuleBuilder mb = ParserUtils.getParentModule(this); - final QNameModule qm = QNameModule.create(mb.getNamespace(), mb.getRevision()); - - List newPath = new ArrayList<>(); - for (QName name : targetPath.getPathFromRoot()) { - newPath.add(QName.create(qm, name.getPrefix(), name.getLocalName())); - } - instance.targetPath = SchemaPath.create(newPath, false); - } else { - instance.targetPath = targetNodeSchemaPath; - } - if (copyOf != null) { instance.setCopyOf(copyOf.build()); } @@ -131,18 +87,6 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain } instance.whenCondition = whenStmt; - // CHILD NODES - for (DataSchemaNodeBuilder node : addedChildNodes) { - childNodes.put(node.getQName(), node.build()); - } - instance.childNodes = ImmutableSet.copyOf(childNodes.values()); - - // USES - for (UsesNodeBuilder builder : addedUsesNodes) { - usesNodes.add(builder.build()); - } - instance.uses = ImmutableSet.copyOf(usesNodes); - // UNKNOWN NODES for (UnknownSchemaNodeBuilder b : addedUnknownNodes) { unknownNodes.add(b.build()); @@ -162,54 +106,32 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain this.resolved = resolved; } + /** + * 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 String getWhenCondition() { - return whenCondition; - } - - @Override - public void addWhenCondition(final String whenCondition) { - this.whenCondition = whenCondition; - } - - @Override - public Set getTypeDefinitionBuilders() { - return Collections.emptySet(); - } - - @Override - public void addTypedef(final TypeDefinitionBuilder type) { - throw new YangParseException(getModuleName(), type.getLine(), "Augmentation can not contains typedef statement."); - } - - @Override - public String getDescription() { - return description; - } - - @Override - public void setDescription(final String description) { - this.description = description; + 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 getReference() { - return reference; + public boolean isUnsupportedTarget() { + return unsupportedTarget; } @Override - public void setReference(final String reference) { - this.reference = reference; - } - - @Override - public Status getStatus() { - return status; + public String getWhenCondition() { + return whenCondition; } @Override - public void setStatus(final Status status) { - this.status = Preconditions.checkNotNull(status, "status cannot be null"); + public void addWhenCondition(final String whenCondition) { + this.whenCondition = whenCondition; } @Override @@ -217,21 +139,6 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain return augmentTargetStr; } - @Override - public SchemaPath getTargetPath() { - return targetPath; - } - - @Override - public SchemaPath getTargetNodeSchemaPath() { - return targetNodeSchemaPath; - } - - @Override - public void setTargetNodeSchemaPath(final SchemaPath path) { - this.targetNodeSchemaPath = path; - } - @Override public int getOrder() { return order; @@ -241,9 +148,9 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain 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; } @@ -273,11 +180,7 @@ 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; @@ -291,190 +194,4 @@ public final class AugmentationSchemaBuilderImpl extends AbstractDataNodeContain public void setCopyOf(final AugmentationSchemaBuilder old) { copyOf = old; } - - private static final class AugmentationSchemaImpl implements AugmentationSchema, NamespaceRevisionAware, - Comparable { - private final int order; - private SchemaPath targetPath; - private RevisionAwareXPath whenCondition; - private ImmutableSet childNodes; - private ImmutableSet uses; - private String description; - private String reference; - private Status status; - - private URI namespace; - private Date revision; - private ImmutableList unknownNodes; - private AugmentationSchema copyOf; - - public AugmentationSchemaImpl(final SchemaPath targetPath, final int order) { - this.targetPath = targetPath; - this.order = order; - } - - public void setCopyOf(final AugmentationSchema build) { - this.copyOf = build; - } - - @Override - public Optional getOriginalDefinition() { - return Optional.fromNullable(this.copyOf); - } - - @Override - public SchemaPath getTargetPath() { - return targetPath; - } - - @Override - public RevisionAwareXPath getWhenCondition() { - return whenCondition; - } - - @Override - public Set getChildNodes() { - return 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 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 unknownNodes; - } - - @Override - public DataSchemaNode getDataChildByName(final QName name) { - return getChildNode(childNodes, name); - } - - @Override - public DataSchemaNode getDataChildByName(final String name) { - return getChildNode(childNodes, name); - } - - @Override - public URI getNamespace() { - return namespace; - } - - @Override - public Date getRevision() { - return revision; - } - - @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(final 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(); - } - - @Override - public int compareTo(final AugmentationSchemaImpl 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; - } - } - }