Push out FIXMEs to 6.0.0

[yangtools.git] / yang / yang-model-api / src / main / java / org / opendaylight / yangtools / yang / model / api / ModuleImport.java

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java
index 43976a8a16a2004ea46755602bda70962a1b6c3d..5b0ce0587cf6529d570d9b5b20671aba7c791c40 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/ModuleImport.java
@@ -8,26 +8,26 @@
 package org.opendaylight.yangtools.yang.model.api;
 
 import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.SemVer;
 import org.opendaylight.yangtools.yang.common.Revision;
 
 /**
- * Interface describing YANG 'import' statement.
- *
- * <p>
- * The import statement makes definitions from one module available inside another module or submodule.
+ * Interface describing YANG 'import' statement. The import statement makes definitions from one module available inside
+ * another module or submodule.
  */
-// FIXME: 5.0.0 this class is a leak of the declared world into the effective one. In effective world, all nodes form
-//        a tree, which consists of multiple (mostly) QName-navigated namespaces. As such module imports contribute
-//        only a prefix/QNameModule mapping to the effective world and hence should be mapped that way:
-//        - Module exposes String->QNameModule mapping
+// FIXME: 6.0.0: this class is a leak of the declared world into the effective one. In effective world, all nodes form
+//               a tree, which consists of multiple (mostly) QName-navigated namespaces. As such module imports
+//               contribute only a prefix/QNameModule mapping to the effective world and hence should be mapped that
+//               way:
+//               - Module exposes String->QNameModule mapping
 public interface ModuleImport extends DocumentedNode {
     /**
      * Returns the name of the module to import.
      *
      * @return Name of the module to import
      */
-    String getModuleName();
+    @NonNull String getModuleName();
 
     /**
      * Returns the module revision to import. May be null.
@@ -48,5 +48,5 @@ public interface ModuleImport extends DocumentedNode {
      *
      * @return Prefix used to point to imported module
      */
-    String getPrefix();
+    @NonNull String getPrefix();
 }