From c3e7916182012ce9d27aec9af750162b8938e758 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 16 Oct 2021 10:56:14 +0200 Subject: [PATCH] Deprecate AugmentationSchemaNode.getOriginalDefinition() This method is on its way out, mark them as deprecated, so downstreams are aware of that. JIRA: YANGTOOLS-1349 Change-Id: Id1a4d631d31185567984ed694397f0b871777dd6 Signed-off-by: Robert Varga --- .../model/api/AugmentationSchemaNode.java | 20 +++++++++---------- .../eff/AugmentEffectiveStatementImpl.java | 3 ++- 2 files changed, 12 insertions(+), 11 deletions(-) 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 ac44a33246..5ee675d35f 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 @@ -20,24 +20,24 @@ import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; public interface AugmentationSchemaNode extends DataNodeContainer, NotificationNodeContainer, ActionNodeContainer, WhenConditionAware, WithStatus, EffectiveStatementEquivalent { /** - * Returns augmentation schema path. + * Returns augmentation target path. * - * @return SchemaNodeIdentifier that identifies a node in the schema tree. This node - * is called the augment's target node. The target node MUST be - * either a container, list, choice, case, input, output, or - * notification node. It is augmented with the nodes defined as - * child nodes of this AugmentationSchema. + * @return SchemaNodeIdentifier that identifies a node in the schema tree. This node is called the augment's target + * node. The target node MUST be either a container, list, choice, case, input, output, or anotification + * node. It is augmented with the nodes defined as child nodes of this AugmentationSchema. */ default SchemaNodeIdentifier getTargetPath() { return asEffectiveStatement().argument(); } /** - * Returns Augmentation Definition from which this augmentation is derived - * if augmentation was added transitively via augmented uses. + * 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. + * @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/impl/eff/AugmentEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java index f367214ae7..70603e469f 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 @@ -54,8 +54,9 @@ public final class AugmentEffectiveStatementImpl } @Override + @Deprecated(since = "7.0.9", forRemoval = true) public Optional getOriginalDefinition() { - return Optional.ofNullable(this.original); + return Optional.ofNullable(original); } @Override -- 2.36.6