X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=parser%2Fyang-parser-reactor%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Freactor%2FInferredStatementContext.java;h=d37cd34b0c5703bec8d915ff9c9a527a4f30134f;hb=a964a780e67e0f094f275a35c20a9079cb902a47;hp=c528de4152e2843446935b4a1a68386e8477f0be;hpb=90a39a82b1e6215d3b7a3510bd1ab73a38445d3e;p=yangtools.git
diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java
index c528de4152..d37cd34b0c 100644
--- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java
+++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/InferredStatementContext.java
@@ -225,8 +225,8 @@ final class InferredStatementContext, E extend
@Override
E createInferredEffective(final StatementFactory factory, final InferredStatementContext ctx,
- final Stream extends StmtContext, ?, ?>> declared,
- final Stream extends StmtContext, ?, ?>> effective) {
+ final Stream extends ReactorStmtCtx, ?, ?>> declared,
+ final Stream extends ReactorStmtCtx, ?, ?>> effective) {
return originalCtx.createInferredEffective(factory, ctx, declared, effective);
}
@@ -259,11 +259,11 @@ final class InferredStatementContext, E extend
// ... copy-sensitive check
final List declCopy = prototype.streamDeclared()
- .map(sub -> effectiveCopy((ReactorStmtCtx, ?, ?>) sub))
+ .map(this::effectiveCopy)
.filter(Objects::nonNull)
.collect(Collectors.toUnmodifiableList());
final List effCopy = prototype.streamEffective()
- .map(sub -> effectiveCopy((ReactorStmtCtx, ?, ?>) sub))
+ .map(this::effectiveCopy)
.filter(Objects::nonNull)
.collect(Collectors.toUnmodifiableList());
@@ -329,10 +329,10 @@ final class InferredStatementContext, E extend
return reusePrototypeReplicas(Streams.concat(prototype.streamDeclared(), prototype.streamEffective()));
}
- private List> reusePrototypeReplicas(final Stream> stream) {
+ private List> reusePrototypeReplicas(final Stream> stream) {
return stream
.map(stmt -> {
- final ReplicaStatementContext, ?, ?> ret = ((ReactorStmtCtx, ?, ?>) stmt).replicaAsChildOf(this);
+ final var ret = stmt.replicaAsChildOf(this);
ret.buildEffective();
return ret;
})
@@ -493,12 +493,12 @@ final class InferredStatementContext, E extend
}
@Override
- Stream extends @NonNull StmtContext, ?, ?>> streamDeclared() {
+ Stream extends @NonNull ReactorStmtCtx, ?, ?>> streamDeclared() {
return Stream.empty();
}
@Override
- Stream extends @NonNull StmtContext, ?, ?>> streamEffective() {
+ Stream extends @NonNull ReactorStmtCtx, ?, ?>> streamEffective() {
return ensureEffectiveSubstatements().stream().filter(StmtContext::isSupportedToBuildEffective);
}