Merge "Bug 981: Make sure QName is not null in RPC case."

[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 e43af791c959ea0d94f6638130bb1bacfbeb61e6..fca44fb1efd266598758f2ffbda9cb79d2ae4fd6 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
@@ -11,13 +11,8 @@ 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;
-import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
-import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
-import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint;
-import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
+import org.opendaylight.yangtools.yang.model.api.*;
+import org.opendaylight.yangtools.yang.model.api.type.*;
 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;
@@ -31,26 +26,32 @@ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder imple
     private static final String NAME = "identityref";
 
     private final String baseString;
-    private final SchemaPath schemaPath;
-    private QName baseQName;
+    private SchemaPath schemaPath;
+    private IdentitySchemaNodeBuilder baseIdentity;
 
-    IdentityrefTypeBuilder(final String moduleName, final int line, final String baseString, final SchemaPath schemaPath) {
+    public IdentityrefTypeBuilder(final String moduleName, final int line, final String baseString,
+            final SchemaPath schemaPath) {
         super(moduleName, line, BaseTypes.constructQName(NAME));
         this.baseString = baseString;
         this.schemaPath = schemaPath;
     }
 
+    @Override
+    public void setQName(QName qname) {
+        this.qname = qname;
+    }
+
     @Override
     public IdentityrefType build() {
-        return new IdentityrefType(baseQName, schemaPath);
+        return new IdentityrefType(baseIdentity.build(), schemaPath);
     }
 
     public String getBaseString() {
         return baseString;
     }
 
-    public void setBaseQName(QName baseQName) {
-        this.baseQName = baseQName;
+    public void setBaseIdentity(IdentitySchemaNodeBuilder baseIdentity) {
+        this.baseIdentity = baseIdentity;
     }
 
     @Override
@@ -73,11 +74,6 @@ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder imple
         throw new YangParseException(moduleName, line, "Can not set type to " + NAME);
     }
 
-    @Override
-    public void setPath(final SchemaPath schemaPath) {
-        throw new YangParseException(moduleName, line, "Can not set path to " + NAME);
-    }
-
     @Override
     public void setDescription(final String description) {
         throw new YangParseException(moduleName, line, "Can not set description to " + NAME);
@@ -103,11 +99,6 @@ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder imple
         throw new YangParseException(moduleName, line, "Identityref type can not be added by uses.");
     }
 
-    @Override
-    public List<UnknownSchemaNode> getUnknownNodes() {
-        return Collections.emptyList();
-    }
-
     @Override
     public void addUnknownNodeBuilder(final UnknownSchemaNodeBuilder unknownNode) {
         throw new YangParseException(moduleName, line, "Can not add unknown node to " + NAME);
@@ -120,7 +111,12 @@ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder imple
 
     @Override
     public SchemaPath getPath() {
-        return null;
+        return schemaPath;
+    }
+
+    @Override
+    public void setPath(SchemaPath path) {
+        this.schemaPath = path;
     }
 
     @Override
@@ -179,7 +175,7 @@ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder imple
     }
 
     @Override
-    public List<UnknownSchemaNodeBuilder> getUnknownNodeBuilders() {
+    public List<UnknownSchemaNodeBuilder> getUnknownNodes() {
         return Collections.emptyList();
     }
 
@@ -205,8 +201,10 @@ public final class IdentityrefTypeBuilder extends AbstractTypeAwareBuilder imple
 
     @Override
     public String toString() {
-        final StringBuilder result = new StringBuilder(IdentityrefTypeBuilder.class.getSimpleName() + "[");
-        result.append(", base=" + baseQName);
+        final StringBuilder result = new StringBuilder(IdentityrefTypeBuilder.class.getSimpleName());
+        result.append("[");
+        result.append(", base=");
+        result.append(baseIdentity);
         result.append("]");
         return result.toString();
     }