Remove SchemaPath from TypeDefinition implementations

[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / type / LengthRestrictedTypeBuilder.java

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java
index 7789f5d1d0b34c6117e450a37bd0128e3ea1098d..8378773f92e0e3a64d6352c42c99ef0856e65f41 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/LengthRestrictedTypeBuilder.java
@@ -18,8 +18,8 @@ import com.google.common.collect.RangeSet;
 import java.util.List;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ConstraintMetaDefinition;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnresolvedNumber;
 import org.opendaylight.yangtools.yang.model.api.stmt.ValueRange;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
@@ -29,8 +29,8 @@ public abstract class LengthRestrictedTypeBuilder<T extends LengthRestrictedType
         extends AbstractRestrictedTypeBuilder<T> {
     private LengthConstraint lengthConstraint;
 
-    LengthRestrictedTypeBuilder(final T baseType, final SchemaPath path) {
-        super(requireNonNull(baseType), path);
+    LengthRestrictedTypeBuilder(final T baseType, final QName qname) {
+        super(requireNonNull(baseType), qname);
     }
 
     /**
@@ -44,8 +44,7 @@ public abstract class LengthRestrictedTypeBuilder<T extends LengthRestrictedType
      */
     public final void setLengthConstraint(final @NonNull ConstraintMetaDefinition constraint,
             final @NonNull List<ValueRange> ranges) throws InvalidLengthConstraintException {
-        Preconditions.checkState(lengthConstraint == null, "Length alternatives already defined as %s",
-                lengthConstraint);
+        Preconditions.checkState(lengthConstraint == null, "Length constraint already defined as %s", lengthConstraint);
         final LengthConstraint baseLengths = findLenghts();
         if (ranges.isEmpty()) {
             lengthConstraint = baseLengths;
@@ -76,7 +75,7 @@ public abstract class LengthRestrictedTypeBuilder<T extends LengthRestrictedType
         touch();
     }
 
-    abstract T buildType(LengthConstraint lengthConstraint);
+    abstract @NonNull T buildType(LengthConstraint constraint);
 
     @Override
     final T buildType() {
@@ -99,7 +98,7 @@ public abstract class LengthRestrictedTypeBuilder<T extends LengthRestrictedType
     private LengthConstraint findLenghts() {
         Optional<LengthConstraint> ret = Optional.empty();
         T wlk = getBaseType();
-        while (wlk != null && !ret.isPresent()) {
+        while (wlk != null && ret.isEmpty()) {
             ret = wlk.getLengthConstraint();
             wlk = wlk.getBaseType();
         }