From 2abe50d138ad54a0afe9f832cf4469b3cdf59bd8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 31 Oct 2020 12:06:21 +0100 Subject: [PATCH] Remove check for when being copied We have 'when' explicitly excluded, hence we can never observe it in validation. Eliminate this dead code. Change-Id: I4a4fb4c1e2a3d888e02f2db0e49671993e2985ab Signed-off-by: Robert Varga --- .../stmt/augment/AbstractAugmentStatementSupport.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java index 79b6bcde02..a432c6507b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java @@ -33,7 +33,6 @@ 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.WhenEffectiveStatement; -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.rfc7950.stmt.BaseStatementSupport; @@ -261,11 +260,6 @@ abstract class AbstractAugmentStatementSupport private static void validateNodeCanBeCopiedByAugment(final StmtContext sourceCtx, final StatementContextBase targetCtx, final CopyType typeOfCopy, final boolean skipCheckOfMandatoryNodes) { - - if (sourceCtx.producesDeclared(WhenStatement.class)) { - return; - } - if (!skipCheckOfMandatoryNodes && typeOfCopy == CopyType.ADDED_BY_AUGMENTATION && requireCheckOfMandatoryNodes(sourceCtx, targetCtx)) { checkForMandatoryNodes(sourceCtx); -- 2.36.6