Bug 2366 - Effective statments impl merge, retest & bugfix

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / builder / impl / IdentityrefTypeBuilder.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java
index b791ae8a8c4426b14acf3c354da0c188242b30d7..ca2982d84a4bb63d0e579bbf6960e2d6915457ce 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/IdentityrefTypeBuilder.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.yangtools.yang.parser.builder.impl;
 
+import com.google.common.base.Preconditions;
 import java.util.Collections;
 import java.util.List;
-
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
@@ -19,8 +19,9 @@ import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 import org.opendaylight.yangtools.yang.model.util.BaseTypes;
 import org.opendaylight.yangtools.yang.model.util.IdentityrefType;
-import org.opendaylight.yangtools.yang.parser.builder.api.AbstractTypeAwareBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.api.UnknownSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.util.AbstractTypeAwareBuilder;
 import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 
 /**
@@ -37,7 +38,8 @@ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder imple
             final SchemaPath schemaPath) {
         super(moduleName, line, BaseTypes.constructQName(NAME));
         this.baseString = baseString;
-        this.schemaPath = schemaPath;
+        this.schemaPath = Preconditions.checkNotNull(schemaPath, "Schema Path must not be null");
+
     }
 
     @Override
@@ -110,7 +112,7 @@ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder imple
 
     @Override
     public QName getQName() {
-        return null;
+        return qname;
     }
 
     @Override
@@ -205,6 +207,8 @@ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder imple
     @Override
     public String toString() {
         final StringBuilder result = new StringBuilder(IdentityrefTypeBuilder.class.getSimpleName());
+        result.append("[qName=");
+        result.append(qname);
         result.append("[");
         result.append(", base=");
         result.append(baseIdentity);