Fix a nullness warning

getPhase() is required to be non-null, which we are assuring, but do not
have annotated. Add annotation and move the method, as it is a simple
getter.

Change-Id: I71ba333713f8ae25fad0230b5137f025d86faa24
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java
index 29a794a32f30dc5fe4c3758982a517696e78026b..0061094034fb660f05499127602b701a81de1883 100644 (file)
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextWriter.java
@@ -14,6 +14,7 @@ import static com.google.common.base.Verify.verifyNotNull;
 import static java.util.Objects.requireNonNull;
 
 import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementOrigin;
@@ -22,7 +23,7 @@ import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReferenc
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementWriter;
 
 final class StatementContextWriter implements StatementWriter {
-    private final ModelProcessingPhase phase;
+    private final @NonNull ModelProcessingPhase phase;
     private final SourceSpecificContext ctx;
 
     private AbstractResumedStatement<?, ?, ?> current;
@@ -32,6 +33,11 @@ final class StatementContextWriter implements StatementWriter {
         this.phase = requireNonNull(phase);
     }
 
+    @Override
+    public ModelProcessingPhase getPhase() {
+        return phase;
+    }
+
     @Override
     public Optional<? extends ResumedStatement> resumeStatement(final int childId) {
         final AbstractResumedStatement<?, ?, ?> existing = lookupDeclaredChild(current, childId);
@@ -77,11 +83,6 @@ final class StatementContextWriter implements StatementWriter {
         exitStatement();
     }
 
-    @Override
-    public ModelProcessingPhase getPhase() {
-        return phase;
-    }
-
     private void exitStatement() {
         // TODO: AbstractResumedStatement should only ever have AbstractResumedStatement parents, which would:
         //       - remove the StatementSource check