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 org.opendaylight.yangtools.yang.common.QName;
private final 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 SchemaPath targetPath;
+ private SchemaPath targetNodeSchemaPath;
- private final Set<UsesNodeBuilder> usesNodes = new HashSet<UsesNodeBuilder>();
private boolean resolved;
- private final static SchemaPath path = new SchemaPath(Collections.<QName> emptyList(), true);
-
public AugmentationSchemaBuilderImpl(final String moduleName, final int line, final String augmentTargetStr) {
super(moduleName, line, null);
this.augmentTargetStr = augmentTargetStr;
- final SchemaPath targetPath = ParserUtils.parseXPathString(augmentTargetStr);
- dirtyAugmentTarget = targetPath;
+ targetPath = ParserUtils.parseXPathString(augmentTargetStr);
instance = new AugmentationSchemaImpl(targetPath);
}
throw new YangParseException(moduleName, line, "augment can not contains grouping statement");
}
- @Override
- public Set<UsesNodeBuilder> getUsesNodes() {
- return usesNodes;
- }
-
- @Override
- public void addUsesNode(UsesNodeBuilder usesBuilder) {
- usesNodes.add(usesBuilder);
- }
-
@Override
public SchemaPath getPath() {
- return path;
+ return targetNodeSchemaPath;
}
@Override
public AugmentationSchema build() {
if (!built) {
- instance.setDescription(description);
- instance.setReference(reference);
- instance.setStatus(status);
- instance.setTargetPath(finalAugmentTarget);
+ instance.setTargetPath(targetNodeSchemaPath);
RevisionAwareXPath whenStmt;
if (whenCondition == null) {
instance.setWhenCondition(whenStmt);
// CHILD NODES
- final Map<QName, DataSchemaNode> childs = new TreeMap<QName, DataSchemaNode>(Comparators.QNAME_COMP);
for (DataSchemaNodeBuilder node : addedChildNodes) {
- childs.put(node.getQName(), node.build());
+ DataSchemaNode child = node.build();
+ childNodes.add(child);
}
- instance.setChildNodes(childs);
+ instance.addChildNodes(childNodes);
// USES
- final Set<UsesNode> usesNodeDefinitions = new HashSet<UsesNode>();
- for (UsesNodeBuilder builder : usesNodes) {
- usesNodeDefinitions.add(builder.build());
+ for (UsesNodeBuilder builder : addedUsesNodes) {
+ usesNodes.add(builder.build());
}
- instance.setUses(usesNodeDefinitions);
+ instance.addUses(usesNodes);
// UNKNOWN NODES
- List<UnknownSchemaNode> unknownNodes = new ArrayList<UnknownSchemaNode>();
for (UnknownSchemaNodeBuilder b : addedUnknownNodes) {
unknownNodes.add(b.build());
}
Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP);
- instance.setUnknownSchemaNodes(unknownNodes);
+ instance.addUnknownSchemaNodes(unknownNodes);
built = true;
}
@Override
public String getDescription() {
- return description;
+ return instance.description;
}
@Override
- public void setDescription(String description) {
- this.description = description;
+ public void setDescription(final String description) {
+ instance.description = description;
}
@Override
public String getReference() {
- return reference;
+ return instance.reference;
}
@Override
- public void setReference(String reference) {
- this.reference = reference;
+ public void setReference(final String reference) {
+ instance.reference = reference;
}
@Override
public Status getStatus() {
- return status;
+ return instance.status;
}
@Override
public void setStatus(Status status) {
if (status != null) {
- this.status = status;
+ instance.status = status;
}
}
+ @Override
+ public String getTargetPathAsString() {
+ return augmentTargetStr;
+ }
+
@Override
public SchemaPath getTargetPath() {
- return dirtyAugmentTarget;
+ return targetPath;
}
@Override
- public void setTargetPath(SchemaPath path) {
- this.finalAugmentTarget = path;
+ public SchemaPath getTargetNodeSchemaPath() {
+ return targetNodeSchemaPath;
}
@Override
- public String getTargetPathAsString() {
- return augmentTargetStr;
+ public void setTargetNodeSchemaPath(SchemaPath path) {
+ this.targetNodeSchemaPath = path;
}
@Override
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 + ((addedChildNodes == null) ? 0 : addedChildNodes.hashCode());
return result;
}
} else if (!whenCondition.equals(other.whenCondition)) {
return false;
}
- if (childNodes == null) {
- if (other.childNodes != null) {
+ if (addedChildNodes == null) {
+ if (other.addedChildNodes != null) {
return false;
}
- } else if (!childNodes.equals(other.childNodes)) {
+ } else if (!addedChildNodes.equals(other.addedChildNodes)) {
return false;
}
return true;
return "augment " + augmentTargetStr;
}
- private final class AugmentationSchemaImpl implements AugmentationSchema {
+ private static final class AugmentationSchemaImpl implements AugmentationSchema {
private SchemaPath targetPath;
private RevisionAwareXPath whenCondition;
- private Map<QName, DataSchemaNode> childNodes = Collections.emptyMap();
- private Set<UsesNode> uses = Collections.emptySet();
+ private final Set<DataSchemaNode> childNodes = new TreeSet<>(Comparators.SCHEMA_NODE_COMP);
+ private final Set<UsesNode> uses = new HashSet<>();
private String description;
private String reference;
private Status status;
- private List<UnknownSchemaNode> unknownNodes = Collections.emptyList();
+ private final List<UnknownSchemaNode> unknownNodes = new ArrayList<>();
private AugmentationSchemaImpl(SchemaPath targetPath) {
this.targetPath = targetPath;
@Override
public Set<DataSchemaNode> getChildNodes() {
- final Set<DataSchemaNode> result = new TreeSet<DataSchemaNode>(Comparators.SCHEMA_NODE_COMP);
- result.addAll(childNodes.values());
- return result;
+ return Collections.unmodifiableSet(childNodes);
}
- private void setChildNodes(Map<QName, DataSchemaNode> childNodes) {
+ private void addChildNodes(Set<DataSchemaNode> childNodes) {
if (childNodes != null) {
- this.childNodes = childNodes;
+ this.childNodes.addAll(childNodes);
}
}
@Override
public Set<UsesNode> getUses() {
- return uses;
+ return Collections.unmodifiableSet(uses);
}
- private void setUses(Set<UsesNode> uses) {
+ private void addUses(Set<UsesNode> uses) {
if (uses != null) {
- this.uses = uses;
+ this.uses.addAll(uses);
}
}
return description;
}
- private void setDescription(String description) {
- this.description = description;
- }
-
@Override
public String getReference() {
return reference;
}
- private void setReference(String reference) {
- this.reference = reference;
- }
-
@Override
public Status getStatus() {
return status;
}
- private void setStatus(Status status) {
- this.status = status;
- }
-
@Override
public List<UnknownSchemaNode> getUnknownSchemaNodes() {
- return unknownNodes;
+ return Collections.unmodifiableList(unknownNodes);
}
- private void setUnknownSchemaNodes(List<UnknownSchemaNode> unknownSchemaNodes) {
+ private void addUnknownSchemaNodes(List<UnknownSchemaNode> unknownSchemaNodes) {
if (unknownSchemaNodes != null) {
- this.unknownNodes = unknownSchemaNodes;
+ this.unknownNodes.addAll(unknownSchemaNodes);
}
}
@Override
public DataSchemaNode getDataChildByName(QName name) {
- return childNodes.get(name);
+ return getChildNode(childNodes, name);
}
@Override
public DataSchemaNode getDataChildByName(String name) {
- DataSchemaNode result = null;
- for (Map.Entry<QName, DataSchemaNode> entry : childNodes.entrySet()) {
- if (entry.getKey().getLocalName().equals(name)) {
- result = entry.getValue();
- break;
- }
- }
- return result;
+ return getChildNode(childNodes, name);
}
@Override
Code Review / yangtools.git / blobdiff