Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove SchemaPath from TypeDefinition implementations
[yangtools.git]
/
yang
/
yang-model-util
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
model
/
util
/
type
/
DerivedTypeBuilder.java
diff --git
a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypeBuilder.java
b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypeBuilder.java
index 811c6ae316a137f1e4682bc7bdcd283535688669..07a8a9a1c89846a95f51d2951e8cf01e8efd3f9e 100644
(file)
--- a/
yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypeBuilder.java
+++ b/
yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedTypeBuilder.java
@@
-12,7
+12,7
@@
import static java.util.Objects.requireNonNull;
import java.util.Optional;
import org.eclipse.jdt.annotation.NonNull;
import java.util.Optional;
import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yangtools.yang.
model.api.SchemaPath
;
+import org.opendaylight.yangtools.yang.
common.QName
;
import org.opendaylight.yangtools.yang.model.api.Status;
import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
import org.slf4j.Logger;
import org.opendaylight.yangtools.yang.model.api.Status;
import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
import org.slf4j.Logger;
@@
-31,8
+31,8
@@
public abstract class DerivedTypeBuilder<T extends TypeDefinition<T>> extends Ty
private Status status = Status.CURRENT;
private String units;
private Status status = Status.CURRENT;
private String units;
- DerivedTypeBuilder(final T baseType, final
SchemaPath path
) {
- super(requireNonNull(baseType),
path
);
+ DerivedTypeBuilder(final T baseType, final
QName qname
) {
+ super(requireNonNull(baseType),
qname
);
checkArgument(baseType instanceof AbstractBaseType || baseType instanceof AbstractDerivedType
|| baseType instanceof AbstractRestrictedType,
checkArgument(baseType instanceof AbstractBaseType || baseType instanceof AbstractDerivedType
|| baseType instanceof AbstractRestrictedType,
@@
-66,7
+66,7
@@
public abstract class DerivedTypeBuilder<T extends TypeDefinition<T>> extends Ty
final Optional<String> baseUnits = getBaseType().getUnits();
if (baseUnits.isPresent() && !units.equals(baseUnits.get())) {
final Optional<String> baseUnits = getBaseType().getUnits();
if (baseUnits.isPresent() && !units.equals(baseUnits.get())) {
- LOG.warn("Type {} uverrides 'units' of type {} to \"{}\"", get
Path
(), getBaseType(), units);
+ LOG.warn("Type {} uverrides 'units' of type {} to \"{}\"", get
QName
(), getBaseType(), units);
}
this.units = units;
}
this.units = units;