listeners = phaseListeners.get(phase);
if (!listeners.isEmpty()) {
@@ -423,6 +446,53 @@ public abstract class StatementContextBase, E
}
}
+ private void summarizeSubstatementPolicy() {
+ if (definition().support().copyPolicy() == CopyPolicy.EXACT_REPLICA || noSensitiveSubstatements()) {
+ setAllSubstatementsContextIndependent();
+ }
+ }
+
+ /**
+ * Determine whether any substatements are copy-sensitive as determined by {@link StatementSupport#copyPolicy()}.
+ * Only {@link CopyPolicy#CONTEXT_INDEPENDENT}, {@link CopyPolicy#EXACT_REPLICA} and {@link CopyPolicy#IGNORE} are
+ * copy-insensitive. Note that statements which are not {@link StmtContext#isSupportedToBuildEffective()} are all
+ * considered copy-insensitive.
+ *
+ *
+ * Implementations are expected to call {@link #noSensitiveSubstatements()} to actually traverse substatement sets.
+ *
+ * @return True if no substatements require copy-sensitive handling
+ */
+ abstract boolean noSensitiveSubstatements();
+
+ /**
+ * Determine whether any of the provided substatements are context-sensitive for purposes of implementing
+ * {@link #noSensitiveSubstatements()}.
+ *
+ * @param substatements Substatements to check
+ * @return True if no substatements require context-sensitive handling
+ */
+ static boolean noSensitiveSubstatements(final Collection extends ReactorStmtCtx, ?, ?>> substatements) {
+ for (ReactorStmtCtx, ?, ?> stmt : substatements) {
+ if (stmt.isSupportedToBuildEffective()) {
+ if (!stmt.allSubstatementsContextIndependent()) {
+ // This is a recursive property
+ return false;
+ }
+
+ switch (stmt.definition().support().copyPolicy()) {
+ case CONTEXT_INDEPENDENT:
+ case EXACT_REPLICA:
+ case IGNORE:
+ break;
+ default:
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
private void runPhaseListeners(final ModelProcessingPhase phase, final Collection listeners) {
final Iterator listener = listeners.iterator();
while (listener.hasNext()) {
@@ -452,7 +522,7 @@ public abstract class StatementContextBase, E
return definition;
}
- final > void onNamespaceItemAddedAction(final Class type, final K key,
+ final > void onNamespaceItemAddedAction(final Class type, final K key,
final OnNamespaceItemAdded listener) {
final Object potential = getFromNamespace(type, key);
if (potential != null) {
@@ -469,7 +539,7 @@ public abstract class StatementContextBase, E
});
}
- final > void onNamespaceItemAddedAction(final Class type,
+ final > void onNamespaceItemAddedAction(final Class type,
final ModelProcessingPhase phase, final NamespaceKeyCriterion criterion,
final OnNamespaceItemAdded listener) {
final Optional> existing = getFromNamespace(type, criterion);
@@ -495,7 +565,7 @@ public abstract class StatementContextBase, E
});
}
- final > void selectMatch(final Class type,
+ final > void selectMatch(final Class type,
final NamespaceKeyCriterion criterion, final OnNamespaceItemAdded listener) {
final Optional> optMatch = getFromNamespace(type, criterion);
checkState(optMatch.isPresent(), "Failed to find a match for criterion %s in namespace %s node %s", criterion,
@@ -504,7 +574,7 @@ public abstract class StatementContextBase, E
listener.namespaceItemAdded(StatementContextBase.this, type, match.getKey(), match.getValue());
}
- final > void waitForPhase(final Object value, final Class type,
+ final > void waitForPhase(final Object value, final Class type,
final ModelProcessingPhase phase, final NamespaceKeyCriterion criterion,
final OnNamespaceItemAdded listener) {
((StatementContextBase, ? ,?>) value).addPhaseCompletedListener(phase,
@@ -514,7 +584,7 @@ public abstract class StatementContextBase, E
});
}
- private > NamespaceBehaviourWithListeners getBehaviour(
+ private > NamespaceBehaviourWithListeners getBehaviour(
final Class type) {
final NamespaceBehaviour behaviour = getBehaviourRegistry().getNamespaceBehaviour(type);
checkArgument(behaviour instanceof NamespaceBehaviourWithListeners, "Namespace %s does not support listeners",
@@ -536,8 +606,8 @@ public abstract class StatementContextBase, E
* @throws NullPointerException if any of the arguments is null
*/
void addPhaseCompletedListener(final ModelProcessingPhase phase, final OnPhaseFinished listener) {
- checkNotNull(phase, "Statement context processing phase cannot be null at: %s", sourceReference());
- checkNotNull(listener, "Statement context phase listener cannot be null at: %s", sourceReference());
+ requireNonNull(phase, "Statement context processing phase cannot be null");
+ requireNonNull(listener, "Statement context phase listener cannot be null");
ModelProcessingPhase finishedPhase = completedPhase;
while (finishedPhase != null) {
@@ -590,27 +660,27 @@ public abstract class StatementContextBase, E
public Optional extends Mutable, ?, ?>> copyAsChildOf(final Mutable, ?, ?> parent, final CopyType type,
final QNameModule targetModule) {
checkEffectiveModelCompleted(this);
+ return Optional.ofNullable(copyAsChildOfImpl(parent, type, targetModule));
+ }
+ private ReactorStmtCtx copyAsChildOfImpl(final Mutable, ?, ?> parent, final CopyType type,
+ final QNameModule targetModule) {
final StatementSupport support = definition.support();
- final CopyPolicy policy = support.applyCopyPolicy(this, parent, type, targetModule);
+ final CopyPolicy policy = support.copyPolicy();
switch (policy) {
+ case EXACT_REPLICA:
+ return replicaAsChildOf(parent);
case CONTEXT_INDEPENDENT:
- if (hasEmptySubstatements()) {
- // This statement is context-independent and has no substatements -- hence it can be freely shared.
- return Optional.of(replicaAsChildOf(parent));
+ if (allSubstatementsContextIndependent()) {
+ return replicaAsChildOf(parent);
}
- // FIXME: YANGTOOLS-694: filter out all context-independent substatements, eliminate fall-through
+
// fall through
case DECLARED_COPY:
- // FIXME: YANGTOOLS-694: this is still to eager, we really want to copy as a lazily-instantiated
- // context, so that we can support building an effective statement without copying
- // anything -- we will typically end up not being inferred against. In that case,
- // this slim context should end up dealing with differences at buildContext()
- // time. This is a YANGTOOLS-1067 prerequisite (which will deal with what can and
- // cannot be shared across instances).
- return Optional.of(parent.childCopyOf(this, type, targetModule));
+ // FIXME: ugly cast
+ return (ReactorStmtCtx) parent.childCopyOf(this, type, targetModule);
case IGNORE:
- return Optional.empty();
+ return null;
case REJECT:
throw new IllegalStateException("Statement " + support.getPublicView() + " should never be copied");
default:
@@ -618,6 +688,26 @@ public abstract class StatementContextBase, E
}
}
+ @Override
+ final ReactorStmtCtx, ?, ?> asEffectiveChildOf(final StatementContextBase, ?, ?> parent, final CopyType type,
+ final QNameModule targetModule) {
+ final ReactorStmtCtx copy = copyAsChildOfImpl(parent, type, targetModule);
+ if (copy == null) {
+ // The statement fizzled, this should never happen, perhaps a verify()?
+ return null;
+ }
+
+ parent.ensureCompletedPhase(copy);
+ return canReuseCurrent(copy) ? this : copy;
+ }
+
+ private boolean canReuseCurrent(final ReactorStmtCtx copy) {
+ // Defer to statement factory to see if we can reuse this object. If we can and have only context-independent
+ // substatements we can reuse the object. More complex cases are handled indirectly via the copy.
+ return definition.getFactory().canReuseCurrent(copy, this, buildEffective().effectiveSubstatements())
+ && allSubstatementsContextIndependent();
+ }
+
@Override
public final Mutable, ?, ?> childCopyOf(final StmtContext, ?, ?> stmt, final CopyType type,
final QNameModule targetModule) {
@@ -664,13 +754,8 @@ public abstract class StatementContextBase, E
}
@Override
- public final ReactorStmtCtx replicaAsChildOf(final Mutable, ?, ?> parent) {
- checkArgument(parent instanceof StatementContextBase, "Unsupported parent %s", parent);
- return replicaAsChildOf((StatementContextBase, ?, ?>) parent);
- }
-
- final @NonNull ReplicaStatementContext replicaAsChildOf(final StatementContextBase, ?, ?> stmt) {
- return new ReplicaStatementContext<>(stmt, this);
+ final ReplicaStatementContext replicaAsChildOf(final StatementContextBase, ?, ?> parent) {
+ return new ReplicaStatementContext<>(parent, this);
}
private static void checkEffectiveModelCompleted(final StmtContext, ?, ?> stmt) {