Propagate @Nonnull and @Nullable annotations

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / spi / meta / QNameCacheNamespace.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/QNameCacheNamespace.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/QNameCacheNamespace.java
index d6f0192747e2da920727ccc6291aa41d9259eb88..c95f93e159c41f147bf72912aa7a90a89347b590 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/QNameCacheNamespace.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/QNameCacheNamespace.java
@@ -8,6 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.spi.meta;
 
 import java.util.Map;
+import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
 
@@ -29,7 +30,7 @@ public final class QNameCacheNamespace extends NamespaceBehaviour<QName, QName,
     }
 
     @Override
-    public QName get(final QName identifier) {
+    public QName get(@Nonnull final QName identifier) {
         throw new UnsupportedOperationException("Identifier/implementation API borkage");
     }
 
@@ -47,12 +48,12 @@ public final class QNameCacheNamespace extends NamespaceBehaviour<QName, QName,
     public QName getFrom(final NamespaceStorageNode storage, final QName key) {
         final NamespaceStorageNode root = getRoot(storage);
         final QName stored = root.getFromLocalStorage(QNameCacheNamespace.class, key);
-        if (stored == null) {
-            root.addToLocalStorage(QNameCacheNamespace.class, key, key);
-            return key;
-        } else {
+        if (stored != null) {
             return stored;
         }
+
+        root.addToLocalStorage(QNameCacheNamespace.class, key, key);
+        return key;
     }
 
     @Override