Fix StmtContext nullness problems

[yangtools.git] / yang / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / grouping / GroupingEffectiveStatementImpl.java

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/GroupingEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/GroupingEffectiveStatementImpl.java
index 07045b18ec7c99449159cb5975c970e06083a525..38ef2a644501423f9413a019b308dcd04c3a7292 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/GroupingEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/grouping/GroupingEffectiveStatementImpl.java
@@ -13,7 +13,6 @@ import com.google.common.collect.ImmutableSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ActionDefinition;
@@ -31,18 +30,18 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 final class GroupingEffectiveStatementImpl
         extends AbstractEffectiveDocumentedDataNodeContainer<QName, GroupingStatement>
         implements GroupingDefinition, GroupingEffectiveStatement {
-    private final QName qname;
-    private final SchemaPath path;
+    private final @NonNull QName qname;
+    private final @NonNull SchemaPath path;
     private final boolean addedByUses;
-    private final Set<ActionDefinition> actions;
-    private final Set<NotificationDefinition> notifications;
+    private final @NonNull Set<ActionDefinition> actions;
+    private final @NonNull Set<NotificationDefinition> notifications;
     private final @NonNull List<UnknownSchemaNode> unknownNodes;
 
     GroupingEffectiveStatementImpl(
             final StmtContext<QName, GroupingStatement, EffectiveStatement<QName, GroupingStatement>> ctx) {
         super(ctx);
 
-        qname = ctx.getStatementArgument();
+        qname = ctx.coerceStatementArgument();
         path = ctx.getSchemaPath().get();
         addedByUses = ctx.getCopyHistory().contains(CopyType.ADDED_BY_USES);
 
@@ -68,13 +67,11 @@ final class GroupingEffectiveStatementImpl
         unknownNodes = b.build();
     }
 
-    @Nonnull
     @Override
     public QName getQName() {
         return qname;
     }
 
-    @Nonnull
     @Override
     public SchemaPath getPath() {
         return path;
@@ -90,7 +87,6 @@ final class GroupingEffectiveStatementImpl
         return actions;
     }
 
-    @Nonnull
     @Override
     public Set<NotificationDefinition> getNotifications() {
         return notifications;