Remove SchemaPath from TypeDefinition implementations

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

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/TypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/TypeBuilder.java
index 19071d0697263a4404603a642069fb70ef2b11c9..99e6141132bd1c6ecf69f6b018937f812c06e96b 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/TypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/TypeBuilder.java
@@ -12,28 +12,27 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 
 public abstract class TypeBuilder<T extends TypeDefinition<T>> implements Builder<T> {
     private final ImmutableList.Builder<UnknownSchemaNode> unknownSchemaNodes = ImmutableList.builder();
-    private final @NonNull SchemaPath path;
-    private final @Nullable T baseType;
+    private final @NonNull QName qname;
+    private final T baseType;
 
-    TypeBuilder(final @Nullable T baseType, final SchemaPath path) {
-        this.path = requireNonNull(path);
+    TypeBuilder(final T baseType, final QName qname) {
+        this.qname = requireNonNull(qname);
         this.baseType = baseType;
     }
 
-    final @Nullable T getBaseType() {
+    final T getBaseType() {
         return baseType;
     }
 
-    final @NonNull SchemaPath getPath() {
-        return path;
+    final @NonNull QName getQName() {
+        return qname;
     }
 
     final @NonNull Collection<? extends UnknownSchemaNode> getUnknownSchemaNodes() {