package org.opendaylight.yangtools.yang.parser.stmt.reactor;
import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Verify.verify;
import static com.google.common.base.Verify.verifyNotNull;
+import com.google.common.base.VerifyException;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
// Copy constructor
AbstractResumedStatement(final AbstractResumedStatement<A, D, E> original) {
super(original);
- this.rawArgument = original.rawArgument;
- this.substatements = original.substatements;
- this.declaredInstance = original.declaredInstance;
- this.fullyDefined = original.fullyDefined;
+ rawArgument = original.rawArgument;
+ substatements = original.substatements;
+ declaredInstance = original.declaredInstance;
+ fullyDefined = original.fullyDefined;
}
AbstractResumedStatement(final StatementDefinitionContext<A, D, E> def, final StatementSourceReference ref,
}
private @NonNull D loadDeclared() {
- final ModelProcessingPhase phase = getCompletedPhase();
- checkState(phase == ModelProcessingPhase.FULL_DECLARATION || phase == ModelProcessingPhase.EFFECTIVE_MODEL,
- "Cannot build declared instance after phase %s", phase);
- return declaredInstance = definition().getFactory().createDeclared(this, substatementsAsDeclared());
+ final var phase = getCompletedPhase();
+ return switch (phase) {
+ case FULL_DECLARATION, EFFECTIVE_MODEL ->
+ declaredInstance = definition().getFactory().createDeclared(this, substatementsAsDeclared());
+ default -> throw new IllegalStateException("Cannot build declared instance after phase " + phase);
+ };
}
@SuppressWarnings({ "rawtypes", "unchecked" })
// the substatements may be gone by the time the factory attempts to acquire the declared statement.
ctx.declared();
- return factory.createEffective(ctx, declared, effective);
+ return factory.createEffective(ctx, orderSubstatements(declared, effective));
+ }
+
+ private static @NonNull Stream<StmtContext<?, ?, ?>> orderSubstatements(
+ final Stream<? extends StmtContext<?, ?, ?>> declaredSubstatements,
+ final Stream<? extends StmtContext<?, ?, ?>> effectiveSubstatements) {
+ /*
+ * This dance is required to ensure that effects of 'uses' nodes are applied in the same order as
+ * the statements were defined -- i.e. if we have something like this:
+ *
+ * container foo {
+ * uses bar;
+ * uses baz;
+ * }
+ *
+ * grouping baz {
+ * leaf baz {
+ * type string;
+ * }
+ * }
+ *
+ * grouping bar {
+ * leaf bar {
+ * type string;
+ * }
+ * }
+ *
+ * The reactor would first inline 'uses baz' as that definition is the first one completely resolved and then
+ * inline 'uses bar'. Here we are iterating in declaration order re-inline the statements.
+ *
+ * FIXME: 7.0.0: this really should be handled by UsesStatementSupport such that 'uses baz' would have a
+ * prerequisite of a resolved 'uses bar'.
+ */
+ final var declaredInit = declaredSubstatements
+ .filter(StmtContext::isSupportedByFeatures)
+ .collect(Collectors.toList());
+
+ final var substatementsInit = new ArrayList<StmtContext<?, ?, ?>>();
+ Set<StmtContext<?, ?, ?>> filteredStatements = null;
+ for (var declaredSubstatement : declaredInit) {
+ substatementsInit.add(declaredSubstatement);
+
+ // FIXME: YANGTOOLS-1161: we need to integrate this functionality into the reactor, so that this
+ // transformation is something reactor's declared statements already take into
+ // account.
+ final Collection<? extends StmtContext<?, ?, ?>> effect = declaredSubstatement.getEffectOfStatement();
+ if (!effect.isEmpty()) {
+ if (filteredStatements == null) {
+ filteredStatements = new HashSet<>();
+ }
+ filteredStatements.addAll(effect);
+ // Note: we need to filter here to exclude unsupported statements
+ effect.stream().filter(StmtContext::isSupportedToBuildEffective).forEach(substatementsInit::add);
+ }
+ }
+
+ final Stream<? extends StmtContext<?, ?, ?>> effective;
+ if (filteredStatements != null) {
+ final var filtered = filteredStatements;
+ effective = effectiveSubstatements.filter(stmt -> !filtered.contains(stmt));
+ } else {
+ effective = effectiveSubstatements;
+ }
+
+ substatementsInit.addAll(effective.collect(Collectors.toList()));
+ return substatementsInit.stream();
}
@Override
AbstractResumedStatement<X, Y, Z> createSubstatement(final int offset,
final StatementDefinitionContext<X, Y, Z> def, final StatementSourceReference ref,
final String argument) {
- final ModelProcessingPhase inProgressPhase = getRoot().getSourceContext().getInProgressPhase();
+ final var inProgressPhase = getRoot().getSourceContext().getInProgressPhase();
checkState(inProgressPhase != ModelProcessingPhase.EFFECTIVE_MODEL,
"Declared statement cannot be added in effective phase at: %s", sourceReference());
private static @NonNull AbstractResumedStatement<?, ?, ?> unmaskUndeclared(final ReactorStmtCtx<?, ?, ?> stmt) {
var ret = stmt;
while (!(ret instanceof AbstractResumedStatement<?, ?, ?> resumed)) {
- verify(ret instanceof UndeclaredStmtCtx, "Unexpectred statement %s", ret);
- ret = ((UndeclaredStmtCtx<?, ?, ?>) ret).getResumedSubstatement();
+ if (ret instanceof UndeclaredStmtCtx<?, ?, ?> undeclared) {
+ ret = undeclared.getResumedSubstatement();
+ } else {
+ throw new VerifyException("Unexpected statement " + ret);
+ }
}
return resumed;
}
var ret = verifyParent(parent);
// Unwind all undeclared statements
- while (!(ret instanceof AbstractResumedStatement)) {
+ while (!(ret instanceof AbstractResumedStatement<?, ?, ?> resumed)) {
ret.finishDeclaration(phase);
ret = verifyParent(ret.getParentContext());
}
- return (AbstractResumedStatement<?, ?, ?>) ret;
+ return resumed;
}
// FIXME: AbstractResumedStatement should only ever have OriginalStmtCtx parents, which would remove the need for
// this method. In ordered to do that we need to untangle SubstatementContext's users and do not allow it
// being reparent()ed.
private static OriginalStmtCtx<?, ?, ?> verifyParent(final StatementContextBase<?, ?, ?> parent) {
- verify(parent instanceof OriginalStmtCtx, "Unexpected parent context %s", parent);
- return (OriginalStmtCtx<?, ?, ?>) parent;
+ if (parent instanceof OriginalStmtCtx<?, ?, ?> original) {
+ return original;
+ }
+ throw new VerifyException("Unexpected parent context " + parent);
}
final void resizeSubstatements(final int expectedSize) {
package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import java.util.List;
import java.util.regex.Pattern;
+import java.util.stream.Stream;
import org.opendaylight.yangtools.yang.common.Empty;
import org.opendaylight.yangtools.yang.model.api.Status;
import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
}
@Override
- protected final List<? extends StmtContext<?, ?, ?>> statementsToBuild(
+ protected final Stream<? extends StmtContext<?, ?, ?>> statementsToBuild(
final Current<SchemaNodeIdentifier, AugmentStatement> stmt,
- final List<? extends StmtContext<?, ?, ?>> substatements) {
+ final Stream<? extends StmtContext<?, ?, ?>> substatements) {
// Pick up the marker left by onFullDefinitionDeclared() inference action. If it is present we need to pass our
// children through target's implicit wrapping.
final var implicitDef = stmt.namespaceItem(AugmentImplicitHandlingNamespace.INSTANCE, Empty.value());
return implicitDef == null ? substatements
- : Lists.transform(substatements, subCtx -> implicitDef.wrapWithImplicit(subCtx));
+ : substatements.map(subCtx -> implicitDef.wrapWithImplicit(subCtx));
}
@Override
import static java.util.Objects.requireNonNull;
import com.google.common.collect.ImmutableList;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yangtools.yang.common.QName;
public final E createUndeclaredEffective(final UndeclaredCurrent<QName, D> stmt,
final @NonNull Stream<? extends StmtContext<?, ?, ?>> effectiveSubstatements) {
return createUndeclaredEffective(stmt, buildEffectiveSubstatements(stmt,
- statementsToBuild(stmt, effectiveSubstatements
- .filter(StmtContext::isSupportedToBuildEffective)
- .collect(Collectors.toUnmodifiableList()))));
+ statementsToBuild(stmt, effectiveSubstatements.filter(StmtContext::isSupportedToBuildEffective))));
}
abstract @NonNull E createUndeclaredEffective(@NonNull UndeclaredCurrent<QName, D> stmt,
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.stream.Stream;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yangtools.yang.common.Empty;
import org.opendaylight.yangtools.yang.common.QNameModule;
@Override
protected ImmutableList<? extends EffectiveStatement<?, ?>> buildEffectiveSubstatements(
final Current<Unqualified, ModuleStatement> stmt,
- final List<? extends StmtContext<?, ?, ?>> substatements) {
+ final Stream<? extends StmtContext<?, ?, ?>> substatements) {
final ImmutableList<? extends EffectiveStatement<?, ?>> local =
super.buildEffectiveSubstatements(stmt, substatements);
final Collection<StmtContext<?, ?, ?>> submodules = submoduleContexts(stmt);
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import java.util.Collection;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yangtools.yang.common.Decimal64;
final UndeclaredCurrent<QName, TypeStatement> stmt,
final Stream<? extends StmtContext<?, ?, ?>> effectiveSubstatements) {
final ImmutableList<? extends EffectiveStatement<?, ?>> substatements = buildEffectiveSubstatements(stmt,
- statementsToBuild(stmt, effectiveSubstatements
- .filter(StmtContext::isSupportedToBuildEffective)
- .collect(Collectors.toUnmodifiableList())));
+ statementsToBuild(stmt, effectiveSubstatements.filter(StmtContext::isSupportedToBuildEffective)));
// First look up the proper base type
final TypeEffectiveStatement<TypeStatement> typeStmt = resolveType(stmt);
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableList;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
protected AbstractStatementSupport(final StatementDefinition publicDefinition, final StatementPolicy<A, D> policy,
final YangParserConfiguration config, final @Nullable SubstatementValidator validator) {
super(publicDefinition, policy);
- this.retainDeclarationReference = config.retainDeclarationReferences();
- this.substatementValidator = validator;
+ retainDeclarationReference = config.retainDeclarationReferences();
+ substatementValidator = validator;
}
@Override
@NonNull ImmutableList<DeclaredStatement<?>> substatements);
private @NonNull D attachDeclarationReference(final @NonNull D stmt, final @NonNull BoundStmtCtx<A> ctx) {
- final DeclarationReference ref = ctx.sourceReference().declarationReference();
+ final var ref = ctx.sourceReference().declarationReference();
return ref == null ? stmt : attachDeclarationReference(stmt, ref);
}
protected abstract @NonNull D attachDeclarationReference(@NonNull D stmt, @NonNull DeclarationReference reference);
@Override
- public final E createEffective(final Current<A, D> stmt,
- final Stream<? extends StmtContext<?, ?, ?>> declaredSubstatements,
- final Stream<? extends StmtContext<?, ?, ?>> inferredSubstatements) {
- final ImmutableList<? extends EffectiveStatement<?, ?>> substatements =
- buildEffectiveSubstatements(stmt, statementsToBuild(stmt,
- declaredSubstatements(declaredSubstatements, inferredSubstatements)));
- return createEffective(stmt, substatements);
+ public final E createEffective(final Current<A, D> stmt, final Stream<StmtContext<?, ?, ?>> substatements) {
+ return createEffective(stmt, buildEffectiveSubstatements(stmt, statementsToBuild(stmt, substatements)));
}
protected abstract @NonNull E createEffective(@NonNull Current<A, D> stmt,
* @param substatements Substatement contexts which have been determined to be built
* @return Substatement context which are to be actually built
*/
- protected
List<? extends StmtContext<?, ?, ?>> statementsToBuild(final Current<A, D> ctx,
- final List<? extends StmtContext<?, ?, ?>> substatements) {
+ protected
Stream<? extends StmtContext<?, ?, ?>> statementsToBuild(final Current<A, D> ctx,
+ final Stream<? extends StmtContext<?, ?, ?>> substatements) {
return substatements;
}
// FIXME: add documentation
public static final <E extends EffectiveStatement<?, ?>> @Nullable E findFirstStatement(
final Collection<? extends EffectiveStatement<?, ?>> statements, final Class<E> type) {
- for (EffectiveStatement<?, ?> stmt : statements) {
+ for (var stmt : statements) {
if (type.isInstance(stmt)) {
return type.cast(stmt);
}
* @return Built effective substatements
*/
protected @NonNull ImmutableList<? extends EffectiveStatement<?, ?>> buildEffectiveSubstatements(
- final Current<A, D> stmt, final List<? extends StmtContext<?, ?, ?>> substatements) {
- return substatements.stream().map(StmtContext::buildEffective).collect(ImmutableList.toImmutableList());
- }
-
- private static @NonNull List<StmtContext<?, ?, ?>> declaredSubstatements(
- final Stream<? extends StmtContext<?, ?, ?>> declaredSubstatements,
- final Stream<? extends StmtContext<?, ?, ?>> effectiveSubstatements) {
- /*
- * This dance is required to ensure that effects of 'uses' nodes are applied in the same order as
- * the statements were defined -- i.e. if we have something like this:
- *
- * container foo {
- * uses bar;
- * uses baz;
- * }
- *
- * grouping baz {
- * leaf baz {
- * type string;
- * }
- * }
- *
- * grouping bar {
- * leaf bar {
- * type string;
- * }
- * }
- *
- * The reactor would first inline 'uses baz' as that definition is the first one completely resolved and then
- * inline 'uses bar'. Here we are iterating in declaration order re-inline the statements.
- *
- * FIXME: 7.0.0: this really should be handled by UsesStatementSupport such that 'uses baz' would have a
- * prerequisite of a resolved 'uses bar'.
- */
- final List<StmtContext<?, ?, ?>> declaredInit = declaredSubstatements
- .filter(StmtContext::isSupportedByFeatures)
- .collect(Collectors.toList());
-
- final List<StmtContext<?, ?, ?>> substatementsInit = new ArrayList<>();
- Set<StmtContext<?, ?, ?>> filteredStatements = null;
- for (final StmtContext<?, ?, ?> declaredSubstatement : declaredInit) {
- substatementsInit.add(declaredSubstatement);
-
- // FIXME: YANGTOOLS-1161: we need to integrate this functionality into the reactor, so that this
- // transformation is something reactor's declared statements already take into
- // account.
- final Collection<? extends StmtContext<?, ?, ?>> effect = declaredSubstatement.getEffectOfStatement();
- if (!effect.isEmpty()) {
- if (filteredStatements == null) {
- filteredStatements = new HashSet<>();
- }
- filteredStatements.addAll(effect);
- // Note: we need to filter here to exclude unsupported statements
- effect.stream().filter(StmtContext::isSupportedToBuildEffective).forEach(substatementsInit::add);
- }
- }
-
- final Stream<? extends StmtContext<?, ?, ?>> effective;
- if (filteredStatements != null) {
- final Set<StmtContext<?, ?, ?>> filtered = filteredStatements;
- effective = effectiveSubstatements.filter(stmt -> !filtered.contains(stmt));
- } else {
- effective = effectiveSubstatements;
- }
-
- substatementsInit.addAll(effective.collect(Collectors.toList()));
- return substatementsInit;
+ final Current<A, D> stmt, final Stream<? extends StmtContext<?, ?, ?>> substatements) {
+ return substatements.map(StmtContext::buildEffective).collect(ImmutableList.toImmutableList());
}
}
}
@Override
- public E createEffective(final Current<A, D> stmt,
- final Stream<? extends StmtContext<?, ?, ?>> declaredSubstatements,
- final Stream<? extends StmtContext<?, ?, ?>> inferredSubstatements) {
- return delegate.createEffective(stmt, declaredSubstatements, inferredSubstatements);
+ public E createEffective(final Current<A, D> stmt, final Stream<StmtContext<?, ?, ?>> substatements) {
+ return delegate.createEffective(stmt, substatements);
}
@Override
* Create a {@link EffectiveStatement} for specified context.
*
* @param stmt Effective capture of this statement's significant state
- * @param declaredSubstatements effectively-visible declared substatements
- * @param inferredSubstatements effectively-visible inferred substatements
+ * @param substatements effectively-visible substatements
* @return An effective statement instance
*/
- // FIXME: we really want a single coherent 'effectiveSubstatements' stream
- @NonNull E createEffective(@NonNull Current<A, D> stmt,
- Stream<? extends StmtContext<?, ?, ?>> declaredSubstatements,
- Stream<? extends StmtContext<?, ?, ?>> inferredSubstatements);
+ @NonNull E createEffective(@NonNull Current<A, D> stmt, @NonNull Stream<StmtContext<?, ?, ?>> substatements);
/**
* Create a {@link EffectiveStatement} copy of provided original for specified context.
Code Review / yangtools.git / commitdiff