Migrate users of Optional.get()

[yangtools.git] / parser / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / repo / StatementContextVisitor.java

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java
index 6f8e8802b42f62069768ae41370f06d92f3323b9..2346051315f0e2c2ca5a7149668cd55388347c5c 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/StatementContextVisitor.java
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.repo;
 
 import static java.util.Objects.requireNonNull;
 
-import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.YangConstants;
@@ -24,7 +23,6 @@ import org.opendaylight.yangtools.yang.parser.spi.source.PrefixResolver;
 import org.opendaylight.yangtools.yang.parser.spi.source.QNameToStatementDefinition;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementWriter;
-import org.opendaylight.yangtools.yang.parser.spi.source.StatementWriter.ResumedStatement;
 
 class StatementContextVisitor {
     private final QNameToStatementDefinition stmtDef;
@@ -88,9 +86,9 @@ class StatementContextVisitor {
 
     // Normal entry point, checks for potential resume
     private boolean processStatement(final int myOffset, final IRStatement stmt) {
-        final Optional<? extends ResumedStatement> optResumed = writer.resumeStatement(myOffset);
+        final var optResumed = writer.resumeStatement(myOffset);
         if (optResumed.isPresent()) {
-            final ResumedStatement resumed = optResumed.get();
+            final var resumed = optResumed.orElseThrow();
             return resumed.isFullyDefined() || doProcessStatement(stmt, resumed.getSourceReference());
         }
         return processNewStatement(myOffset, stmt);