X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Freactor%2FStatementContextBase.java;fp=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Freactor%2FStatementContextBase.java;h=6c148f50a679c499b0e242c40de81479a3a5eb49;hb=cc5aa8ec1c4c108d1f397ff5f8c516f29813c85b;hp=d394e2715ed7d34146430c3235d33781c07efd5e;hpb=e807a055a1f878b4e0fd74d5763caaa7ab16a8c7;p=yangtools.git
diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
index d394e2715e..6c148f50a6 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/StatementContextBase.java
@@ -115,12 +115,7 @@ public abstract class StatementContextBase, E
original.getStatementSourceReference());
this.rawArgument = original.rawArgument;
this.copyHistory = CopyHistory.of(copyType, original.getCopyHistory());
-
- if (original.getOriginalCtx() != null) {
- this.originalCtx = original.getOriginalCtx();
- } else {
- this.originalCtx = original;
- }
+ this.originalCtx = original.getOriginalCtx().orElse(original);
}
@Override
@@ -177,8 +172,8 @@ public abstract class StatementContextBase, E
}
@Override
- public StmtContext, ?, ?> getOriginalCtx() {
- return originalCtx;
+ public Optional> getOriginalCtx() {
+ return Optional.ofNullable(originalCtx);
}
@Override
@@ -384,9 +379,8 @@ public abstract class StatementContextBase, E
final Optional> implicitStatement = definition.beforeSubStatementCreated(this,
offset, def, ref, argument);
- if(implicitStatement.isPresent()) {
- final StatementContextBase, ?, ?> presentImplicitStmt = implicitStatement.get();
- return presentImplicitStmt.createSubstatement(offset, def, ref, argument);
+ if (implicitStatement.isPresent()) {
+ return implicitStatement.get().createSubstatement(offset, def, ref, argument);
}
final StatementContextBase ret = new SubstatementContext<>(this, def, ref, argument);