package org.opendaylight.yangtools.yang.model.api.stmt;
import com.google.common.annotations.Beta;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
@Beta
public interface AugmentEffectiveStatement extends EffectiveStatement<SchemaNodeIdentifier, AugmentStatement> {
-
+ @Override
+ default StatementDefinition statementDefinition() {
+ return YangStmtMapping.AUGMENT;
+ }
}
import java.util.Collection;
import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
import org.opendaylight.yangtools.yang.model.api.stmt.DocumentedDeclaredStatement.WithStatus;
public interface AugmentStatement extends WithStatus<SchemaNodeIdentifier>,
NotificationStatementAwareDeclaredStatement<SchemaNodeIdentifier>,
ActionStatementAwareDeclaredStatement<SchemaNodeIdentifier>,
WhenStatementAwareDeclaredStatement<SchemaNodeIdentifier> {
+ @Override
+ default StatementDefinition statementDefinition() {
+ return YangStmtMapping.AUGMENT;
+ }
default @NonNull SchemaNodeIdentifier getTargetNode() {
// FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
import org.opendaylight.yangtools.yang.model.api.stmt.TypedefEffectiveStatement;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+@Deprecated(forRemoval = true)
public abstract class AbstractEffectiveDocumentedDataNodeContainer<A, D extends DeclaredStatement<A>>
extends AbstractSchemaEffectiveDocumentedNode<A, D> implements DataNodeContainer {
@Override
public final E createEffective(final StmtContext<A, D, E> ctx) {
final D declared = ctx.buildDeclared();
- final ImmutableList<? extends EffectiveStatement<?, ?>> substatements = buildEffectiveSubstatements(ctx);
+ final ImmutableList<? extends EffectiveStatement<?, ?>> substatements =
+ buildEffectiveSubstatements(statementsToBuild(ctx, declaredSubstatements(ctx)));
return substatements.isEmpty() ? createEmptyEffective(ctx, declared)
: createEffective(ctx, declared, substatements);
}
protected abstract @NonNull E createEmptyEffective(@NonNull StmtContext<A, D, E> ctx, @NonNull D declared);
+ /**
+ * Give statement support a hook to transform statement contexts before they are built. Default implementation
+ * does nothing, but note {@code augment} statement performs a real transformation.
+ *
+ * @param ctx Parent statement context
+ * @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 StmtContext<A, D, E> ctx,
+ final List<? extends StmtContext<?, ?, ?>> substatements) {
+ return substatements;
+ }
+
protected static final <E extends EffectiveStatement<?, ?>> @Nullable E findFirstStatement(
final ImmutableList<? extends EffectiveStatement<?, ?>> statements, final Class<E> type) {
for (EffectiveStatement<?, ?> stmt : statements) {
*/
package org.opendaylight.yangtools.yang.parser.rfc7950.stmt;
-import com.google.common.annotations.Beta;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
import java.util.Collection;
* @param ctx context of statement.
*/
protected EffectiveStatementBase(final StmtContext<A, D, ?> ctx) {
- this.substatements = ImmutableList.copyOf(initSubstatements(ctx,
- BaseStatementSupport.declaredSubstatements(ctx)));
- }
-
- @Beta
- protected Collection<? extends EffectiveStatement<?, ?>> initSubstatements(final StmtContext<A, D, ?> ctx,
- final Collection<? extends StmtContext<?, ?, ?>> substatementsInit) {
- return initSubstatements(substatementsInit);
+ this.substatements = ImmutableList.copyOf(initSubstatements(BaseStatementSupport.declaredSubstatements(ctx)));
}
/**
*/
package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment;
+import static com.google.common.base.Verify.verify;
+
import com.google.common.base.Verify;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.regex.Pattern;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.YangVersion;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Status;
import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
+import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.AugmentEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.DataDefinitionStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier;
+import org.opendaylight.yangtools.yang.model.api.stmt.StatusEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.UsesStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement;
import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.ChildSchemaNodeNamespace;
import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.ArgumentUtils;
-import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.EffectiveStatementWithFlags.FlagsBuilder;
import org.opendaylight.yangtools.yang.parser.spi.meta.CopyType;
import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder;
import org.slf4j.LoggerFactory;
abstract class AbstractAugmentStatementSupport
- extends AbstractStatementSupport<SchemaNodeIdentifier, AugmentStatement, AugmentEffectiveStatement> {
+ extends BaseStatementSupport<SchemaNodeIdentifier, AugmentStatement, AugmentEffectiveStatement> {
private static final Logger LOG = LoggerFactory.getLogger(AbstractAugmentStatementSupport.class);
private static final Pattern PATH_REL_PATTERN1 = Pattern.compile("\\.\\.?\\s*/(.+)");
private static final Pattern PATH_REL_PATTERN2 = Pattern.compile("//.*");
return ArgumentUtils.nodeIdentifierFromPath(ctx, value);
}
- @Override
- public final AugmentStatement createDeclared(final StmtContext<SchemaNodeIdentifier, AugmentStatement, ?> ctx) {
- return new AugmentStatementImpl(ctx);
- }
-
- @Override
- public final AugmentEffectiveStatement createEffective(
- final StmtContext<SchemaNodeIdentifier, AugmentStatement, AugmentEffectiveStatement> ctx) {
- return new AugmentEffectiveStatementImpl(ctx);
- }
-
@Override
public final void onFullDefinitionDeclared(
final Mutable<SchemaNodeIdentifier, AugmentStatement, AugmentEffectiveStatement> augmentNode) {
});
}
+ @Override
+ protected final AugmentStatement createDeclared(final StmtContext<SchemaNodeIdentifier, AugmentStatement, ?> ctx,
+ final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+ return new RegularAugmentStatement(ctx, substatements);
+ }
+
+ @Override
+ protected final AugmentStatement createEmptyDeclared(
+ final StmtContext<SchemaNodeIdentifier, AugmentStatement, ?> ctx) {
+ return new EmptyAugmentStatement(ctx);
+ }
+
+ @Override
+ protected final List<? extends StmtContext<?, ?, ?>> statementsToBuild(
+ final StmtContext<SchemaNodeIdentifier, AugmentStatement, AugmentEffectiveStatement> ctx,
+ final List<? extends StmtContext<?, ?, ?>> substatements) {
+ final StatementContextBase<?, ?, ?> implicitDef = ctx.getFromNamespace(AugmentImplicitHandlingNamespace.class,
+ ctx);
+ return implicitDef == null ? substatements : Lists.transform(substatements, subCtx -> {
+ verify(subCtx instanceof StatementContextBase);
+ return implicitDef.wrapWithImplicit((StatementContextBase<?, ?, ?>) subCtx);
+ });
+ }
+
+ @Override
+ protected final AugmentEffectiveStatement createEffective(
+ final StmtContext<SchemaNodeIdentifier, AugmentStatement, AugmentEffectiveStatement> ctx,
+ final AugmentStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+ final int flags = new FlagsBuilder()
+ .setStatus(findFirstArgument(substatements, StatusEffectiveStatement.class, Status.CURRENT))
+ .toFlags();
+
+ return new AugmentEffectiveStatementImpl(declared, flags, StmtContextUtils.getRootModuleQName(ctx),
+ substatements, ctx.getStatementSourceReference(),
+ (AugmentationSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null));
+ }
+
+ @Override
+ protected final AugmentEffectiveStatement createEmptyEffective(
+ final StmtContext<SchemaNodeIdentifier, AugmentStatement, AugmentEffectiveStatement> ctx,
+ final AugmentStatement declared) {
+ return createEffective(ctx, declared, ImmutableList.of());
+ }
+
private static StmtContext<?, ?, ?> getSearchRoot(final StmtContext<?, ?, ?> augmentContext) {
// Augment is in uses - we need to augment instantiated nodes in parent.
final StmtContext<?, ?, ?> parent = augmentContext.coerceParentContext();
*/
package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment;
-import static com.google.common.base.Verify.verify;
+import static java.util.Objects.requireNonNull;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableList;
import java.net.URI;
-import java.util.Collection;
import java.util.Objects;
import java.util.Optional;
-import java.util.Set;
import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.yangtools.yang.common.QNameModule;
import org.opendaylight.yangtools.yang.common.Revision;
-import org.opendaylight.yangtools.yang.model.api.ActionDefinition;
import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
import org.opendaylight.yangtools.yang.model.api.NamespaceRevisionAware;
-import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
-import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath;
import org.opendaylight.yangtools.yang.model.api.SchemaPath;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.AugmentEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier;
-import org.opendaylight.yangtools.yang.model.api.stmt.WhenEffectiveStatement;
-import org.opendaylight.yangtools.yang.model.api.stmt.compat.ActionNodeContainerCompat;
-import org.opendaylight.yangtools.yang.model.api.stmt.compat.NotificationNodeContainerCompat;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractEffectiveDocumentedDataNodeContainer;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
-import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase;
-
-final class AugmentEffectiveStatementImpl
- extends AbstractEffectiveDocumentedDataNodeContainer<SchemaNodeIdentifier, AugmentStatement>
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement.DefaultDataNodeContainer;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.ActionNodeContainerMixin;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.DataNodeContainerMixin;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.DocumentedNodeMixin;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.NotificationNodeContainerMixin;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.EffectiveStatementMixins.WhenConditionMixin;
+import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
+
+final class AugmentEffectiveStatementImpl extends DefaultDataNodeContainer<SchemaNodeIdentifier, AugmentStatement>
implements AugmentEffectiveStatement, AugmentationSchemaNode, NamespaceRevisionAware,
- ActionNodeContainerCompat<SchemaNodeIdentifier, AugmentStatement>,
- NotificationNodeContainerCompat<SchemaNodeIdentifier, AugmentStatement> {
- private final SchemaPath targetPath;
- private final QNameModule rootModuleQName;
- private final @NonNull ImmutableSet<ActionDefinition> actions;
- private final @NonNull ImmutableSet<NotificationDefinition> notifications;
- private final RevisionAwareXPath whenCondition;
- private final AugmentationSchemaNode copyOf;
-
- AugmentEffectiveStatementImpl(
- final StmtContext<SchemaNodeIdentifier, AugmentStatement, AugmentEffectiveStatement> ctx) {
- super(ctx);
- targetPath = ctx.coerceStatementArgument().asSchemaPath();
- rootModuleQName = StmtContextUtils.getRootModuleQName(ctx);
- copyOf = (AugmentationSchemaNode) ctx.getOriginalCtx().map(StmtContext::buildEffective).orElse(null);
- whenCondition = findFirstEffectiveSubstatementArgument(WhenEffectiveStatement.class).orElse(null);
-
- // initSubstatementCollections
- final ImmutableSet.Builder<ActionDefinition> actionsBuilder = ImmutableSet.builder();
- final ImmutableSet.Builder<NotificationDefinition> notificationsBuilder = ImmutableSet.builder();
- for (final EffectiveStatement<?, ?> effectiveStatement : effectiveSubstatements()) {
- if (effectiveStatement instanceof ActionDefinition) {
- actionsBuilder.add((ActionDefinition) effectiveStatement);
- } else if (effectiveStatement instanceof NotificationDefinition) {
- notificationsBuilder.add((NotificationDefinition) effectiveStatement);
- }
- }
-
- actions = actionsBuilder.build();
- notifications = notificationsBuilder.build();
+ DocumentedNodeMixin.WithStatus<SchemaNodeIdentifier, AugmentStatement>,
+ DataNodeContainerMixin<SchemaNodeIdentifier, AugmentStatement>,
+ ActionNodeContainerMixin<SchemaNodeIdentifier, AugmentStatement>,
+ NotificationNodeContainerMixin<SchemaNodeIdentifier, AugmentStatement>,
+ WhenConditionMixin<SchemaNodeIdentifier, AugmentStatement> {
+ private final @Nullable AugmentationSchemaNode original;
+ private final @NonNull QNameModule rootModuleQName;
+ private final int flags;
+
+ AugmentEffectiveStatementImpl(final AugmentStatement declared, final int flags, final QNameModule rootModuleQName,
+ final ImmutableList<? extends EffectiveStatement<?, ?>> substatements, final StatementSourceReference ref,
+ final @Nullable AugmentationSchemaNode original) {
+ super(declared, ref, substatements);
+ this.rootModuleQName = requireNonNull(rootModuleQName);
+ this.flags = flags;
+ this.original = original;
}
@Override
- protected Collection<? extends EffectiveStatement<?, ?>> initSubstatements(
- final StmtContext<SchemaNodeIdentifier, AugmentStatement, ?> ctx,
- final Collection<? extends StmtContext<?, ?, ?>> substatementsInit) {
- final StatementContextBase<?, ?, ?> implicitDef = ctx.getFromNamespace(AugmentImplicitHandlingNamespace.class,
- ctx);
- return implicitDef == null ? super.initSubstatements(ctx, substatementsInit)
- : Collections2.transform(Collections2.filter(substatementsInit,
- StmtContext::isSupportedToBuildEffective),
- subCtx -> {
- verify(subCtx instanceof StatementContextBase);
- return implicitDef.wrapWithImplicit((StatementContextBase<?, ?, ?>) subCtx).buildEffective();
- });
+ public SchemaNodeIdentifier argument() {
+ return getDeclared().argument();
}
@Override
public Optional<AugmentationSchemaNode> getOriginalDefinition() {
- return Optional.ofNullable(this.copyOf);
+ return Optional.ofNullable(this.original);
}
@Override
public SchemaPath getTargetPath() {
- return targetPath;
+ return argument().asSchemaPath();
}
@Override
- public Optional<RevisionAwareXPath> getWhenCondition() {
- return Optional.ofNullable(whenCondition);
+ public int flags() {
+ return flags;
}
@Override
return rootModuleQName.getRevision();
}
- @Override
- public Set<ActionDefinition> getActions() {
- return actions;
- }
-
- @Override
- public Set<NotificationDefinition> getNotifications() {
- return notifications;
- }
-
@Override
public int hashCode() {
final int prime = 17;
int result = 1;
- result = prime * result + Objects.hashCode(targetPath);
- result = prime * result + Objects.hashCode(whenCondition);
+ result = prime * result + Objects.hashCode(getTargetPath());
+ result = prime * result + Objects.hashCode(getWhenCondition());
result = prime * result + getChildNodes().hashCode();
return result;
}
return false;
}
final AugmentEffectiveStatementImpl other = (AugmentEffectiveStatementImpl) obj;
- return Objects.equals(targetPath, other.targetPath) && Objects.equals(whenCondition, other.whenCondition)
+ return Objects.equals(getTargetPath(), other.getTargetPath())
+ && Objects.equals(getWhenCondition(), other.getWhenCondition())
&& getChildNodes().equals(other.getChildNodes());
}
@Override
+
public String toString() {
- return AugmentEffectiveStatementImpl.class.getSimpleName() + "[" + "targetPath=" + targetPath + ", when="
- + whenCondition + "]";
+ return AugmentEffectiveStatementImpl.class.getSimpleName() + "[" + "targetPath=" + getTargetPath() + ", when="
+ + getWhenCondition() + "]";
}
}
/*
- * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2020 PANTHEON.tech, s.r.o. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier;
-import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithArgument;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
-final class AugmentStatementImpl extends AbstractDeclaredStatement<SchemaNodeIdentifier> implements AugmentStatement {
- AugmentStatementImpl(final StmtContext<SchemaNodeIdentifier, AugmentStatement, ?> context) {
+final class EmptyAugmentStatement extends WithArgument<SchemaNodeIdentifier> implements AugmentStatement {
+ EmptyAugmentStatement(final StmtContext<SchemaNodeIdentifier, ?, ?> context) {
super(context);
}
}
--- /dev/null
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment;
+
+import com.google.common.collect.ImmutableList;
+import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.WithArgument.WithSubstatements;
+import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+
+final class RegularAugmentStatement extends WithSubstatements<SchemaNodeIdentifier> implements AugmentStatement {
+ RegularAugmentStatement(final StmtContext<SchemaNodeIdentifier, ?, ?> ctx,
+ final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+ super(ctx, substatements);
+ }
+}
Code Review / yangtools.git / commitdiff