From: Robert Varga Date: Fri, 15 Oct 2021 08:13:16 +0000 (+0200) Subject: Remove AugmentationSchemaNode.getOriginalDefinition() X-Git-Tag: v8.0.0~11 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=76102cf8eb2106610a3e087d2ae47097105b933a Remove AugmentationSchemaNode.getOriginalDefinition() There is only one user of this method and it is able to cope with it being gone. Remove it along with parser methods it needs to work. JIRA: YANGTOOLS-1379 Change-Id: I3d0ef9378975b140ff5c9dc61eab3fa77a4dfdcd Signed-off-by: Robert Varga --- diff --git a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchemaNode.java b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchemaNode.java index 5ee675d35f..dab265fa75 100644 --- a/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchemaNode.java +++ b/model/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/AugmentationSchemaNode.java @@ -7,7 +7,6 @@ */ package org.opendaylight.yangtools.yang.model.api; -import java.util.Optional; import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; import org.opendaylight.yangtools.yang.model.api.stmt.AugmentEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; @@ -29,15 +28,4 @@ public interface AugmentationSchemaNode extends DataNodeContainer, NotificationN default SchemaNodeIdentifier getTargetPath() { return asEffectiveStatement().argument(); } - - /** - * Returns Augmentation Definition from which this augmentation is derived if augmentation was added transitively - * via augmented uses. - * - * @return Augmentation Definition from which this augmentation is derived if augmentation was added transitively - * via augmented uses. - * @deprecated This method has only a single user, who should be able to do without it. - */ - @Deprecated(since = "7.0.9", forRemoval = true) - Optional getOriginalDefinition(); } diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java index dc6590032b..e9ca7fc01d 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java @@ -17,7 +17,6 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ElementCountConstraint; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; @@ -343,9 +342,9 @@ public final class EffectiveStatements { public static AugmentEffectiveStatement createAugment(final AugmentStatement declared, final SchemaNodeIdentifier argument, final int flags, final QNameModule rootModuleQName, - final ImmutableList> substatements, - final @Nullable AugmentationSchemaNode original) throws SubstatementIndexingException { - return new AugmentEffectiveStatementImpl(declared, argument, flags, rootModuleQName, substatements, original); + final ImmutableList> substatements) + throws SubstatementIndexingException { + return new AugmentEffectiveStatementImpl(declared, argument, flags, rootModuleQName, substatements); } public static BaseEffectiveStatement createBase(final BaseStatement declared, diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java index b92d94f7fe..46d4c6dd2b 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java @@ -10,9 +10,7 @@ package org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff; import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList; -import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; @@ -37,20 +35,17 @@ public final class AugmentEffectiveStatementImpl ActionNodeContainerMixin, NotificationNodeContainerMixin, WhenConditionMixin { - private final @Nullable AugmentationSchemaNode original; private final @NonNull SchemaNodeIdentifier argument; private final @NonNull QNameModule rootModuleQName; private final int flags; public AugmentEffectiveStatementImpl(final AugmentStatement declared, final SchemaNodeIdentifier argument, final int flags, final QNameModule rootModuleQName, - final ImmutableList> substatements, - final @Nullable AugmentationSchemaNode original) { + final ImmutableList> substatements) { super(declared, substatements); this.argument = requireNonNull(argument); this.rootModuleQName = requireNonNull(rootModuleQName); this.flags = flags; - this.original = original; } @Override @@ -58,12 +53,6 @@ public final class AugmentEffectiveStatementImpl return argument; } - @Override - @Deprecated(since = "7.0.9", forRemoval = true) - public Optional getOriginalDefinition() { - return Optional.ofNullable(original); - } - @Override public int flags() { return flags; diff --git a/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java index 30f54f7c07..8da591350d 100644 --- a/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java +++ b/model/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/EffectiveAugmentationSchema.java @@ -121,11 +121,6 @@ public final class EffectiveAugmentationSchema implements AugmentationSchemaNode return delegate.getUses(); } - @Override - public Optional getOriginalDefinition() { - return delegate.getOriginalDefinition(); - } - @Override public Collection getActions() { return delegate.getActions(); diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ForwardingUndeclaredCurrent.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ForwardingUndeclaredCurrent.java index 84ffdd29d3..f372147309 100644 --- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ForwardingUndeclaredCurrent.java +++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ForwardingUndeclaredCurrent.java @@ -38,12 +38,6 @@ final class ForwardingUndeclaredCurrent> exten return delegate.moduleName(); } - @Override - @Deprecated(forRemoval = true) - public EffectiveStatement original() { - return delegate.original(); - } - @Override public QName argumentAsTypeQName() { return delegate.argumentAsTypeQName(); diff --git a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java index a3bc8a0581..e0507835b9 100644 --- a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java +++ b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java @@ -238,12 +238,6 @@ abstract class ReactorStmtCtx, E extends Effec return QName.create(StmtContextUtils.getRootModuleQName(root), root.getRawArgument()); } - @Override - @Deprecated(since = "7.0.9", forRemoval = true) - public final EffectiveStatement original() { - return getOriginalCtx().map(StmtContext::buildEffective).orElse(null); - } - // // In the next two methods we are looking for an effective statement. If we already have an effective instance, // defer to it's implementation of the equivalent search. Otherwise we search our substatement contexts. diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java index f09d66e483..f771fc6c88 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java +++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java @@ -9,12 +9,9 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.augment; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.List; -import java.util.Objects; import java.util.regex.Pattern; import org.opendaylight.yangtools.yang.common.Empty; -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.DeclarationReference; @@ -58,7 +55,6 @@ abstract class AbstractAugmentStatementSupport (copy, current, substatements) -> copy.getArgument().equals(current.getArgument()) && copy.moduleName().getModule().equals(current.moduleName().getModule()) - && Objects.equals(copy.original(), current.original()) ), config, validator); } @@ -133,7 +129,6 @@ abstract class AbstractAugmentStatementSupport } @Override - @SuppressFBWarnings(value = "BC_UNCONFIRMED_CAST", justification = "Cast of original(), should be always safe") protected final AugmentEffectiveStatement createEffective( final Current stmt, final ImmutableList> substatements) { @@ -143,7 +138,7 @@ abstract class AbstractAugmentStatementSupport try { return EffectiveStatements.createAugment(stmt.declared(), stmt.getArgument(), flags, - stmt.moduleName().getModule(), substatements, (AugmentationSchemaNode) stmt.original()); + stmt.moduleName().getModule(), substatements); } catch (SubstatementIndexingException e) { throw new SourceException(e.getMessage(), stmt, e); } diff --git a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractSchemaTreeStatementSupport.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractSchemaTreeStatementSupport.java index 40c14ee432..9d70d31829 100644 --- a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractSchemaTreeStatementSupport.java +++ b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/AbstractSchemaTreeStatementSupport.java @@ -72,7 +72,6 @@ public abstract class AbstractSchemaTreeStatementSupport{@link Current#argument()} does not change *
  • {@link Current#history()} does not change as far as {@link CopyableNode} is concerned
    • *
  • {@link Current#effectiveConfig()} does not change
    • - *
  • {@link Current#original()} does not change
    • * * *

    diff --git a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java index c98c9fa14d..1c4df64735 100644 --- a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java +++ b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/EffectiveStmtCtx.java @@ -110,9 +110,6 @@ public interface EffectiveStmtCtx extends CommonStmtCtx, StmtContextCompat, Immu @NonNull QName moduleName(); - @Deprecated(since = "7.0.9", forRemoval = true) - @Nullable EffectiveStatement original(); - // FIXME: 8.0.0: this method should be moved to stmt.type in some shape or form @NonNull QName argumentAsTypeQName();