Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Implemented ordering of yang module data nodes. Added Comparators utility class.
[controller.git]
/
opendaylight
/
sal
/
yang-prototype
/
code-generator
/
yang-model-parser-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
yang
/
parser
/
builder
/
impl
/
ExtensionBuilder.java
diff --git
a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ExtensionBuilder.java
b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ExtensionBuilder.java
index 65fd1c49d93873f5c022c2625b296ea2e2000304..a0ee47f7b8d13a7fc7540e4480fac53f7c48abeb 100644
(file)
--- a/
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ExtensionBuilder.java
+++ b/
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/ExtensionBuilder.java
@@
-17,31
+17,32
@@
import org.opendaylight.controller.yang.model.api.SchemaPath;
import org.opendaylight.controller.yang.model.api.Status;
import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
import org.opendaylight.controller.yang.parser.builder.api.AbstractSchemaNodeBuilder;
import org.opendaylight.controller.yang.model.api.Status;
import org.opendaylight.controller.yang.model.api.UnknownSchemaNode;
import org.opendaylight.controller.yang.parser.builder.api.AbstractSchemaNodeBuilder;
+import org.opendaylight.controller.yang.parser.util.Comparators;
public final class ExtensionBuilder extends AbstractSchemaNodeBuilder {
private boolean isBuilt;
private final ExtensionDefinitionImpl instance;
public final class ExtensionBuilder extends AbstractSchemaNodeBuilder {
private boolean isBuilt;
private final ExtensionDefinitionImpl instance;
- private final List<UnknownSchemaNodeBuilder> addedExtensions = new ArrayList<UnknownSchemaNodeBuilder>();
- ExtensionBuilder(final
QName qname, final int lin
e) {
- super(
qname, lin
e);
+ ExtensionBuilder(final
int line, final QName qnam
e) {
+ super(
line, qnam
e);
instance = new ExtensionDefinitionImpl(qname);
}
@Override
public ExtensionDefinition build() {
instance = new ExtensionDefinitionImpl(qname);
}
@Override
public ExtensionDefinition build() {
- if(!isBuilt) {
- instance.setPath(
p
ath);
+ if
(!isBuilt) {
+ instance.setPath(
schemaP
ath);
instance.setDescription(description);
instance.setReference(reference);
instance.setStatus(status);
// UNKNOWN NODES
instance.setDescription(description);
instance.setReference(reference);
instance.setStatus(status);
// UNKNOWN NODES
- final List<UnknownSchemaNode>
extension
s = new ArrayList<UnknownSchemaNode>();
- for (UnknownSchemaNodeBuilder
e : addedExtension
s) {
-
extensions.add(e
.build());
+ final List<UnknownSchemaNode>
unknownNode
s = new ArrayList<UnknownSchemaNode>();
+ for (UnknownSchemaNodeBuilder
un : addedUnknownNode
s) {
+
unknownNodes.add(un
.build());
}
}
- instance.setUnknownSchemaNodes(extensions);
+ Collections.sort(unknownNodes, Comparators.SCHEMA_NODE_COMP);
+ instance.setUnknownSchemaNodes(unknownNodes);
isBuilt = true;
}
isBuilt = true;
}
@@
-49,11
+50,6
@@
public final class ExtensionBuilder extends AbstractSchemaNodeBuilder {
return instance;
}
return instance;
}
-
- public void addExtension(UnknownSchemaNodeBuilder extension) {
- addedExtensions.add(extension);
- }
-
public void setYinElement(boolean yin) {
instance.setYinElement(yin);
}
public void setYinElement(boolean yin) {
instance.setYinElement(yin);
}
@@
-62,7
+58,6
@@
public final class ExtensionBuilder extends AbstractSchemaNodeBuilder {
instance.setArgument(argument);
}
instance.setArgument(argument);
}
-
private final class ExtensionDefinitionImpl implements ExtensionDefinition {
private final QName qname;
private String argument;
private final class ExtensionDefinitionImpl implements ExtensionDefinition {
private final QName qname;
private String argument;
@@
-70,8
+65,7
@@
public final class ExtensionBuilder extends AbstractSchemaNodeBuilder {
private String description;
private String reference;
private Status status = Status.CURRENT;
private String description;
private String reference;
private Status status = Status.CURRENT;
- private List<UnknownSchemaNode> unknownNodes = Collections
- .emptyList();
+ private List<UnknownSchemaNode> unknownNodes = Collections.emptyList();
private boolean yin;
private ExtensionDefinitionImpl(QName qname) {
private boolean yin;
private ExtensionDefinitionImpl(QName qname) {
@@
-126,9
+120,8
@@
public final class ExtensionBuilder extends AbstractSchemaNodeBuilder {
return unknownNodes;
}
return unknownNodes;
}
- private void setUnknownSchemaNodes(
- List<UnknownSchemaNode> unknownNodes) {
- if(unknownNodes != null) {
+ private void setUnknownSchemaNodes(List<UnknownSchemaNode> unknownNodes) {
+ if (unknownNodes != null) {
this.unknownNodes = unknownNodes;
}
}
this.unknownNodes = unknownNodes;
}
}
@@
-156,8
+149,7
@@
public final class ExtensionBuilder extends AbstractSchemaNodeBuilder {
final int prime = 31;
int result = 1;
result = prime * result + ((qname == null) ? 0 : qname.hashCode());
final int prime = 31;
int result = 1;
result = prime * result + ((qname == null) ? 0 : qname.hashCode());
- result = prime * result
- + ((schemaPath == null) ? 0 : schemaPath.hashCode());
+ result = prime * result + ((schemaPath == null) ? 0 : schemaPath.hashCode());
return result;
}
return result;
}
@@
-192,10
+184,9
@@
public final class ExtensionBuilder extends AbstractSchemaNodeBuilder {
@Override
public String toString() {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder(
- ExtensionDefinitionImpl.class.getSimpleName());
+ StringBuilder sb = new StringBuilder(ExtensionDefinitionImpl.class.getSimpleName());
sb.append("[");
sb.append("[");
- sb.append("argument="+ argument);
+ sb.append("argument="
+ argument);
sb.append(", qname=" + qname);
sb.append(", schemaPath=" + schemaPath);
sb.append(", extensionSchemaNodes=" + unknownNodes);
sb.append(", qname=" + qname);
sb.append(", schemaPath=" + schemaPath);
sb.append(", extensionSchemaNodes=" + unknownNodes);