Propagate @Nonnull and @Nullable annotations

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / codec / xml / ElementIdentityrefParser.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/ElementIdentityrefParser.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/ElementIdentityrefParser.java
index fcfaca5ce299c36c17465bebdae18b97bb365912..d92cc43a104f636cfdd158c49583c25f30290f83 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/ElementIdentityrefParser.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/ElementIdentityrefParser.java
@@ -8,9 +8,8 @@
 package org.opendaylight.yangtools.yang.data.impl.codec.xml;
 
 import com.google.common.base.Preconditions;
-
 import java.net.URI;
-
+import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.util.AbstractStringIdentityrefCodec;
 import org.opendaylight.yangtools.yang.model.api.Module;
@@ -27,13 +26,13 @@ final class ElementIdentityrefParser extends AbstractStringIdentityrefCodec {
     }
 
     @Override
-    protected String prefixForNamespace(final URI namespace) {
+    protected String prefixForNamespace(@Nonnull final URI namespace) {
         return element.lookupPrefix(namespace.toString());
     }
 
     @Override
-    protected QName createQName(final String prefix, final String localName) {
-        final String namespace = element.lookupNamespaceURI(prefix);
+    protected QName createQName(@Nonnull final String prefix, @Nonnull final String localName) {
+        final String namespace = element.lookupNamespaceURI(!prefix.isEmpty() ? prefix : null);
         Preconditions.checkArgument(namespace != null, "Failed to lookup prefix %s", prefix);
 
         final URI ns = URI.create(namespace);