Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Replaced Equals/HashcodeBuilder for DatapacketListener"
[controller.git]
/
opendaylight
/
sal
/
yang-prototype
/
code-generator
/
yang-model-parser-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
yang
/
parser
/
builder
/
impl
/
UnionTypeBuilder.java
diff --git
a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UnionTypeBuilder.java
b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UnionTypeBuilder.java
index a184e23e1b84f6dea74e814801aea5660a1a7d0a..61aec1a8c95702f36787f1770791467f36ad3082 100644
(file)
--- a/
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UnionTypeBuilder.java
+++ b/
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/parser/builder/impl/UnionTypeBuilder.java
@@
-7,10
+7,8
@@
*/
package org.opendaylight.controller.yang.parser.builder.impl;
*/
package org.opendaylight.controller.yang.parser.builder.impl;
-import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Date;
import java.util.List;
import org.opendaylight.controller.yang.common.QName;
import java.util.List;
import org.opendaylight.controller.yang.common.QName;
@@
-22,8
+20,8
@@
import org.opendaylight.controller.yang.model.api.type.PatternConstraint;
import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
import org.opendaylight.controller.yang.model.util.UnionType;
import org.opendaylight.controller.yang.parser.builder.api.AbstractTypeAwareBuilder;
import org.opendaylight.controller.yang.model.api.type.RangeConstraint;
import org.opendaylight.controller.yang.model.util.UnionType;
import org.opendaylight.controller.yang.parser.builder.api.AbstractTypeAwareBuilder;
-import org.opendaylight.controller.yang.parser.builder.api.Builder;
import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.controller.yang.parser.util.YangParseException;
/**
* Builder for YANG union type. User can add type to this union as
/**
* Builder for YANG union type. User can add type to this union as
@@
-31,31
+29,22
@@
import org.opendaylight.controller.yang.parser.builder.api.TypeDefinitionBuilder
* When build is called, types in builder form will be built and add to resolved
* types.
*/
* When build is called, types in builder form will be built and add to resolved
* types.
*/
-public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
- TypeDefinitionBuilder, Builder {
- private final static String CLASS_NAME = UnionTypeBuilder.class
- .getSimpleName();
+public final class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
+ TypeDefinitionBuilder {
+ private final static String NAME = "union";
private final int line;
private final List<TypeDefinition<?>> types;
private final List<TypeDefinitionBuilder> typedefs;
private final int line;
private final List<TypeDefinition<?>> types;
private final List<TypeDefinitionBuilder> typedefs;
- private
final
UnionType instance;
- private boolean
b
uilt;
+ private UnionType instance;
+ private boolean
isB
uilt;
- private final List<String> actualPath;
- private final URI namespace;
- private final Date revision;
+ private SchemaPath path;
- public UnionTypeBuilder(final List<String> actualPath, final URI namespace,
- final Date revision, final int line) {
+ public UnionTypeBuilder(final int line) {
this.line = line;
types = new ArrayList<TypeDefinition<?>>();
typedefs = new ArrayList<TypeDefinitionBuilder>();
this.line = line;
types = new ArrayList<TypeDefinition<?>>();
typedefs = new ArrayList<TypeDefinitionBuilder>();
- instance = new UnionType(actualPath, namespace, revision, types);
-
- this.actualPath = actualPath;
- this.namespace = namespace;
- this.revision = revision;
}
@Override
}
@Override
@@
-93,43
+82,40
@@
public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
@Override
public UnionType build() {
@Override
public UnionType build() {
- if (built) {
- return instance;
- } else {
+ if (!isBuilt) {
+ instance = new UnionType(path, types);
for (TypeDefinitionBuilder tdb : typedefs) {
types.add(tdb.build());
}
for (TypeDefinitionBuilder tdb : typedefs) {
types.add(tdb.build());
}
- built = true;
- return instance;
+ isBuilt = true;
}
}
+ return instance;
}
@Override
public void setPath(final SchemaPath schemaPath) {
}
@Override
public void setPath(final SchemaPath schemaPath) {
- th
row new IllegalStateException("Can not set path to " + CLASS_NAME)
;
+ th
is.path = schemaPath
;
}
@Override
public void setDescription(final String description) {
}
@Override
public void setDescription(final String description) {
- throw new IllegalStateException("Can not set description to "
- + CLASS_NAME);
+ throw new YangParseException(line, "Can not set description to " + NAME);
}
@Override
public void setReference(final String reference) {
}
@Override
public void setReference(final String reference) {
- throw new IllegalStateException("Can not set reference to "
- + CLASS_NAME);
+ throw new YangParseException(line, "Can not set reference to " + NAME);
}
@Override
public void setStatus(final Status status) {
}
@Override
public void setStatus(final Status status) {
- throw new
IllegalStateException("Can not set status to " + CLASS_
NAME);
+ throw new
YangParseException(line, "Can not set status to " +
NAME);
}
@Override
public void addUnknownSchemaNode(final UnknownSchemaNodeBuilder unknownNode) {
}
@Override
public void addUnknownSchemaNode(final UnknownSchemaNodeBuilder unknownNode) {
- throw new
IllegalStateException(
"Can not add unknown node to "
- +
CLASS_
NAME);
+ throw new
YangParseException(line,
"Can not add unknown node to "
+ + NAME);
}
@Override
}
@Override
@@
-164,8
+150,7
@@
public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
@Override
public void setRanges(List<RangeConstraint> ranges) {
@Override
public void setRanges(List<RangeConstraint> ranges) {
- throw new IllegalStateException("Can not set ranges to "
- + UnionTypeBuilder.class.getSimpleName());
+ throw new YangParseException(line, "Can not set ranges to " + NAME);
}
@Override
}
@Override
@@
-175,8
+160,7
@@
public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
@Override
public void setLengths(List<LengthConstraint> lengths) {
@Override
public void setLengths(List<LengthConstraint> lengths) {
- throw new IllegalStateException("Can not set lengths to "
- + UnionTypeBuilder.class.getSimpleName());
+ throw new YangParseException(line, "Can not set lengths to " + NAME);
}
@Override
}
@Override
@@
-186,8
+170,7
@@
public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
@Override
public void setPatterns(List<PatternConstraint> patterns) {
@Override
public void setPatterns(List<PatternConstraint> patterns) {
- throw new IllegalStateException("Can not set patterns to "
- + UnionTypeBuilder.class.getSimpleName());
+ throw new YangParseException(line, "Can not set patterns to " + NAME);
}
@Override
}
@Override
@@
-197,8
+180,8
@@
public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
@Override
public void setFractionDigits(Integer fractionDigits) {
@Override
public void setFractionDigits(Integer fractionDigits) {
- throw new
IllegalStateException(
"Can not set fraction digits to "
- +
UnionTypeBuilder.class.getSimpleName()
);
+ throw new
YangParseException(line,
"Can not set fraction digits to "
+ +
NAME
);
}
@Override
}
@Override
@@
-213,8
+196,8
@@
public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
@Override
public void setDefaultValue(Object defaultValue) {
@Override
public void setDefaultValue(Object defaultValue) {
- throw new
IllegalStateException(
"Can not set default value to "
- +
UnionTypeBuilder.class.getSimpleName()
);
+ throw new
YangParseException(line,
"Can not set default value to "
+ +
NAME
);
}
@Override
}
@Override
@@
-224,20
+207,7
@@
public class UnionTypeBuilder extends AbstractTypeAwareBuilder implements
@Override
public void setUnits(String units) {
@Override
public void setUnits(String units) {
- throw new IllegalStateException("Can not set units to "
- + UnionTypeBuilder.class.getSimpleName());
- }
-
- public List<String> getActualPath() {
- return actualPath;
- }
-
- public URI getNamespace() {
- return namespace;
- }
-
- public Date getRevision() {
- return revision;
+ throw new YangParseException(line, "Can not set units to " + NAME);
}
@Override
}
@Override