import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
import com.google.common.collect.Streams;
import java.util.ArrayList;
import java.util.Collection;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement;
-import org.opendaylight.yangtools.yang.parser.spi.SchemaTreeNamespace;
+import org.opendaylight.yangtools.yang.parser.spi.ParserNamespaces;
import org.opendaylight.yangtools.yang.parser.spi.meta.CopyType;
import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStatementState;
import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
@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);
}
// ... 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()
- .map(sub -> effectiveCopy((ReactorStmtCtx<?, ?, ?>) sub))
+ .map(this::effectiveCopy)
.filter(Objects::nonNull)
.collect(Collectors.toUnmodifiableList());
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 -> {
- final ReplicaStatementContext<?, ?, ?> ret = ((ReactorStmtCtx<?, ?, ?>) stmt).replicaAsChildOf(this);
+ final var ret = stmt.replicaAsChildOf(this);
ret.buildEffective();
return ret;
})
}
private static boolean sameSubstatements(final Collection<?> original, final EffectiveStatement<?, ?> effective) {
- final Collection<?> copied = effective.effectiveSubstatements();
+ final var copied = effective.effectiveSubstatements();
if (copied != effective.effectiveSubstatements() || original.size() != copied.size()) {
// Do not bother if result is treating substatements as transient
return false;
}
- final Iterator<?> oit = original.iterator();
- final Iterator<?> cit = copied.iterator();
- while (oit.hasNext()) {
+ final var cit = copied.iterator();
+ for (var origChild : original) {
verify(cit.hasNext());
// Identity comparison on purpose to side-step whatever equality there might be. We want to reuse instances
// after all.
- if (oit.next() != cit.next()) {
+ if (origChild != cit.next()) {
return false;
}
}
if (prototype instanceof InferredStatementContext) {
// Note: we need to access namespace here, as the target statement may have already been populated, in which
// case we want to obtain the statement in local namespace storage.
- template = (StmtContext) ((InferredStatementContext<?, ?, ?>) prototype).getFromNamespace(
- SchemaTreeNamespace.class, templateQName);
+ template = ((InferredStatementContext<?, ?, ?>) prototype).getFromNamespace(ParserNamespaces.schemaTree(),
+ templateQName);
} else {
template = prototype.allSubstatementsStream()
.filter(stmt -> stmt.producesEffective(SchemaTreeEffectiveStatement.class)
}
@SuppressWarnings("unchecked")
- final Mutable<QName, Y, Z> ret = (Mutable<QName, Y, Z>) copySubstatement((Mutable<?, ?, ?>) template)
- .orElseThrow(
- () -> new InferenceException(this, "Failed to materialize child %s template %s", qname, template));
+ final var ret = (Mutable<QName, Y, Z>) copySubstatement(template).orElseThrow(
+ () -> new InferenceException(this, "Failed to materialize child %s template %s", qname, template));
addMaterialized(template, ensureCompletedPhase(ret));
LOG.debug("Child {} materialized", qname);
private List<ReactorStmtCtx<?, ?, ?>> ensureEffectiveSubstatements() {
accessSubstatements();
return substatements instanceof List ? castEffective(substatements)
- : initializeSubstatements(castMaterialized(substatements));
+ // We have either not started or have only partially-materialized statements, ensure full materialization
+ : initializeSubstatements();
}
@Override
}
@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);
}
return count;
}
- private List<ReactorStmtCtx<?, ?, ?>> initializeSubstatements(
- final Map<StmtContext<?, ?, ?>, ReactorStmtCtx<?, ?, ?>> materializedSchemaTree) {
- final Collection<? extends StatementContextBase<?, ?, ?>> declared = prototype.mutableDeclaredSubstatements();
- final Collection<? extends Mutable<?, ?, ?>> effective = prototype.mutableEffectiveSubstatements();
+ private List<ReactorStmtCtx<?, ?, ?>> initializeSubstatements() {
+ final var declared = prototype.mutableDeclaredSubstatements();
+ final var effective = prototype.mutableEffectiveSubstatements();
+
+ // We are about to instantiate some substatements. The simple act of materializing them may end up triggering
+ // namespace lookups, which in turn can materialize copies by themselves, running ahead of our materialization.
+ // We therefore need a meeting place for, which are the partially-materialized substatements. If we do not have
+ // them yet, instantiate them and we need to populate them as well.
+ final int expectedSize = declared.size() + effective.size();
+ var materializedSchemaTree = castMaterialized(substatements);
+ if (materializedSchemaTree == null) {
+ substatements = materializedSchemaTree = Maps.newHashMapWithExpectedSize(expectedSize);
+ }
- final var buffer = new ArrayList<ReactorStmtCtx<?, ?, ?>>(declared.size() + effective.size());
- for (final Mutable<?, ?, ?> stmtContext : declared) {
+ final var buffer = new ArrayList<ReactorStmtCtx<?, ?, ?>>(expectedSize);
+ for (var stmtContext : declared) {
if (stmtContext.isSupportedByFeatures()) {
copySubstatement(stmtContext, buffer, materializedSchemaTree);
}
}
- for (final Mutable<?, ?, ?> stmtContext : effective) {
+ for (var stmtContext : effective) {
copySubstatement(stmtContext, buffer, materializedSchemaTree);
}
- final List<ReactorStmtCtx<?, ?, ?>> ret = beforeAddEffectiveStatementUnsafe(ImmutableList.of(), buffer.size());
+ final var ret = beforeAddEffectiveStatementUnsafe(ImmutableList.of(), buffer.size());
ret.addAll(buffer);
substatements = ret;
setModified();
//
// We could also perform a Map.containsKey() and perform a bulk add, but that would mean the statement order
// against parent would change -- and we certainly do not want that to happen.
- final ReactorStmtCtx<?, ?, ?> materialized = findMaterialized(materializedSchemaTree, substatement);
+ final var materialized = findMaterialized(materializedSchemaTree, substatement);
if (materialized == null) {
copySubstatement(substatement).ifPresent(copy -> {
- buffer.add(ensureCompletedPhase(copy));
+ final var cast = ensureCompletedPhase(copy);
+ materializedSchemaTree.put(substatement, cast);
+ buffer.add(cast);
});
} else {
buffer.add(materialized);
}
}
- private Optional<? extends Mutable<?, ?, ?>> copySubstatement(final Mutable<?, ?, ?> substatement) {
+ private <X, Y extends DeclaredStatement<X>, Z extends EffectiveStatement<X, Y>> Optional<Mutable<X, Y, Z>>
+ copySubstatement(final StmtContext<X, Y, Z> substatement) {
return substatement.copyAsChildOf(this, childCopyType(), targetModule);
}
Code Review / yangtools.git / blobdiff