Migrate yang-model-util annotations

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

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java
index 32148793e1e7ef5f37b2abbfc2538f1db06f67c1..cd172c8598967b2e7987da18a1c45c571ce9fb8b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/AbstractRestrictedTypeBuilder.java
@@ -7,7 +7,9 @@
  */
 package org.opendaylight.yangtools.yang.model.util.type;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Verify.verifyNotNull;
+
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
@@ -18,7 +20,7 @@ abstract class AbstractRestrictedTypeBuilder<T extends TypeDefinition<T>> extend
     AbstractRestrictedTypeBuilder(final T baseType, final SchemaPath path) {
         super(baseType, path);
         if (baseType != null) {
-            Preconditions.checkArgument(baseType instanceof AbstractBaseType || baseType instanceof AbstractDerivedType,
+            checkArgument(baseType instanceof AbstractBaseType || baseType instanceof AbstractDerivedType,
                 "Restricted type has to be based on either a base or derived type, not %s", baseType);
         } else {
             touched = true;
@@ -33,10 +35,6 @@ abstract class AbstractRestrictedTypeBuilder<T extends TypeDefinition<T>> extend
 
     @Override
     public final T build() {
-        if (!touched) {
-            return getBaseType();
-        }
-
-        return buildType();
+        return touched ? buildType() : verifyNotNull(getBaseType());
     }
 }