Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Improve StatementContextBase.stream{Declared,Effective}
[yangtools.git]
/
parser
/
yang-parser-reactor
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
parser
/
stmt
/
reactor
/
InferredStatementContext.java
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 c528de4152e2843446935b4a1a68386e8477f0be..d37cd34b0c5703bec8d915ff9c9a527a4f30134f 100644
(file)
--- 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<A, D extends DeclaredStatement<A>, E extend
@Override
E createInferredEffective(final StatementFactory<A, D, E> factory, final InferredStatementContext<A, D, E> ctx,
@Override
E createInferredEffective(final StatementFactory<A, D, E> factory, final InferredStatementContext<A, D, E> 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);
}
return originalCtx.createInferredEffective(factory, ctx, declared, effective);
}
@@
-259,11
+259,11
@@
final class InferredStatementContext<A, D extends DeclaredStatement<A>, E extend
// ... copy-sensitive check
final List<EffectiveCopy> declCopy = prototype.streamDeclared()
// ... copy-sensitive check
final List<EffectiveCopy> declCopy = prototype.streamDeclared()
- .map(
sub -> effectiveCopy((ReactorStmtCtx<?, ?, ?>) sub)
)
+ .map(
this::effectiveCopy
)
.filter(Objects::nonNull)
.collect(Collectors.toUnmodifiableList());
final List<EffectiveCopy> effCopy = prototype.streamEffective()
.filter(Objects::nonNull)
.collect(Collectors.toUnmodifiableList());
final List<EffectiveCopy> effCopy = prototype.streamEffective()
- .map(
sub -> effectiveCopy((ReactorStmtCtx<?, ?, ?>) sub)
)
+ .map(
this::effectiveCopy
)
.filter(Objects::nonNull)
.collect(Collectors.toUnmodifiableList());
.filter(Objects::nonNull)
.collect(Collectors.toUnmodifiableList());
@@
-329,10
+329,10
@@
final class InferredStatementContext<A, D extends DeclaredStatement<A>, E extend
return reusePrototypeReplicas(Streams.concat(prototype.streamDeclared(), prototype.streamEffective()));
}
return reusePrototypeReplicas(Streams.concat(prototype.streamDeclared(), prototype.streamEffective()));
}
- private List<ReactorStmtCtx<?, ?, ?>> reusePrototypeReplicas(final Stream<
StmtContext
<?, ?, ?>> stream) {
+ private List<ReactorStmtCtx<?, ?, ?>> reusePrototypeReplicas(final Stream<
ReactorStmtCtx
<?, ?, ?>> stream) {
return stream
.map(stmt -> {
return stream
.map(stmt -> {
- final
ReplicaStatementContext<?, ?, ?> ret = ((ReactorStmtCtx<?, ?, ?>) stmt)
.replicaAsChildOf(this);
+ final
var ret = stmt
.replicaAsChildOf(this);
ret.buildEffective();
return ret;
})
ret.buildEffective();
return ret;
})
@@
-493,12
+493,12
@@
final class InferredStatementContext<A, D extends DeclaredStatement<A>, E extend
}
@Override
}
@Override
- Stream<? extends @NonNull
StmtContext
<?, ?, ?>> streamDeclared() {
+ Stream<? extends @NonNull
ReactorStmtCtx
<?, ?, ?>> streamDeclared() {
return Stream.empty();
}
@Override
return Stream.empty();
}
@Override
- Stream<? extends @NonNull
StmtContext
<?, ?, ?>> streamEffective() {
+ Stream<? extends @NonNull
ReactorStmtCtx
<?, ?, ?>> streamEffective() {
return ensureEffectiveSubstatements().stream().filter(StmtContext::isSupportedToBuildEffective);
}
return ensureEffectiveSubstatements().stream().filter(StmtContext::isSupportedToBuildEffective);
}