Un-deprecate CopyableNode, AddedByUsesAware

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

diff --git a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
index 951275b30c3a7d95406a258757ecc5db7ec9d8fd..abefa2c75fb7c69283a60f317cbfd946e0b99c8a 100644 (file)
--- a/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
+++ b/yang/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/StmtContextUtils.java
@@ -19,6 +19,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.Revision;
@@ -477,7 +478,7 @@ public final class StmtContextUtils {
         });
     }
 
-    public static QName qnameFromArgument(StmtContext<?, ?, ?> ctx, final String value) {
+    public static @NonNull QName qnameFromArgument(StmtContext<?, ?, ?> ctx, final String value) {
         if (Strings.isNullOrEmpty(value)) {
             return ctx.publicDefinition().getStatementName();
         }
@@ -520,12 +521,12 @@ public final class StmtContextUtils {
      * @throws NullPointerException if any of the arguments are null
      * @throws SourceException if the string is not a valid YANG identifier
      */
-    public static QName parseIdentifier(final StmtContext<?, ?, ?> ctx, final String str) {
+    public static @NonNull QName parseIdentifier(final StmtContext<?, ?, ?> ctx, final String str) {
         SourceException.throwIf(str.isEmpty(), ctx, "Identifier may not be an empty string");
         return internedQName(ctx, str);
     }
 
-    public static QName parseNodeIdentifier(final StmtContext<?, ?, ?> ctx, final String prefix,
+    public static @NonNull QName parseNodeIdentifier(final StmtContext<?, ?, ?> ctx, final String prefix,
             final String localName) {
         return internedQName(ctx,
             InferenceException.throwIfNull(getModuleQNameByPrefix(ctx, prefix), ctx,
@@ -542,7 +543,7 @@ public final class StmtContextUtils {
      * @throws NullPointerException if any of the arguments are null
      * @throws SourceException if the string is not a valid YANG node identifier
      */
-    public static QName parseNodeIdentifier(final StmtContext<?, ?, ?> ctx, final String str) {
+    public static @NonNull QName parseNodeIdentifier(final StmtContext<?, ?, ?> ctx, final String str) {
         SourceException.throwIf(str.isEmpty(), ctx, "Node identifier may not be an empty string");
 
         final int colon = str.indexOf(':');
@@ -558,11 +559,11 @@ public final class StmtContextUtils {
         return parseNodeIdentifier(ctx, prefix, localName);
     }
 
-    private static QName internedQName(final StmtContext<?, ?, ?> ctx, final String localName) {
+    private static @NonNull QName internedQName(final StmtContext<?, ?, ?> ctx, final String localName) {
         return internedQName(ctx, getRootModuleQName(ctx), localName);
     }
 
-    private static QName internedQName(final CommonStmtCtx ctx, final QNameModule module,
+    private static @NonNull QName internedQName(final CommonStmtCtx ctx, final QNameModule module,
             final String localName) {
         final QName template;
         try {