X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Frfc6020%2FAugmentUtils.java;h=9bcedcb22ba870bcc39e483e09da1346247017fb;hb=78cbd44f2617ed955064036b94f88603bc3de826;hp=c873ddbfbc6d6bace69312c57c7a08b571a86428;hpb=15f75b8bb45e6e3e2454fd7dd837b19b945e4c3a;p=yangtools.git diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java index c873ddbfbc..9bcedcb22b 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java @@ -7,12 +7,14 @@ */ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; +import com.google.common.base.Verify; import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableSet; import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.Set; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; import org.opendaylight.yangtools.yang.model.api.stmt.DataDefinitionStatement; import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryStatement; @@ -24,6 +26,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace; import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace.ValidationBundleType; +import org.opendaylight.yangtools.yang.parser.stmt.reactor.RootStatementContext; import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase; // FIXME: Move this to the AugmentStatementDefinition#ApplyAction @@ -41,17 +44,12 @@ public final class AugmentUtils { private static void copyDeclaredStmts(final StatementContextBase sourceCtx, final StatementContextBase targetCtx) throws SourceException { - final List> subStatements = new Builder>() - .addAll(targetCtx.declaredSubstatements()).addAll(targetCtx.effectiveSubstatements()).build(); - boolean sourceAndTargetInSameModule = Utils.getRootModuleQName(sourceCtx).equals( - Utils.getRootModuleQName(targetCtx)); - TypeOfCopy typeOfCopy = sourceCtx.getParentContext().getPublicDefinition().getDeclaredRepresentationClass() .equals(UsesStatement.class) ? TypeOfCopy.ADDED_BY_USES_AUGMENTATION : TypeOfCopy.ADDED_BY_AUGMENTATION; for (StatementContextBase originalStmtCtx : sourceCtx.declaredSubstatements()) { if (needToCopyByAugment(originalStmtCtx)) { - validateNodeCanBeCopiedByAugment(originalStmtCtx, subStatements, sourceAndTargetInSameModule); + validateNodeCanBeCopiedByAugment(originalStmtCtx, targetCtx); StatementContextBase copy = originalStmtCtx.createCopy(targetCtx, typeOfCopy); targetCtx.addEffectiveSubstatement(copy); @@ -63,18 +61,12 @@ public final class AugmentUtils { private static void copyEffectiveStmts(final StatementContextBase sourceCtx, final StatementContextBase targetCtx) throws SourceException { - - final List> subStatements = new Builder>() - .addAll(targetCtx.declaredSubstatements()).addAll(targetCtx.effectiveSubstatements()).build(); - boolean sourceAndTargetInSameModule = Utils.getRootModuleQName(sourceCtx).equals( - Utils.getRootModuleQName(targetCtx)); - TypeOfCopy typeOfCopy = sourceCtx.getParentContext().getPublicDefinition().getDeclaredRepresentationClass() .equals(UsesStatement.class) ? TypeOfCopy.ADDED_BY_USES_AUGMENTATION : TypeOfCopy.ADDED_BY_AUGMENTATION; for (StatementContextBase originalStmtCtx : sourceCtx.effectiveSubstatements()) { if (needToCopyByAugment(originalStmtCtx)) { - validateNodeCanBeCopiedByAugment(originalStmtCtx, subStatements, sourceAndTargetInSameModule); + validateNodeCanBeCopiedByAugment(originalStmtCtx, targetCtx); StatementContextBase copy = originalStmtCtx.createCopy(targetCtx, typeOfCopy); targetCtx.addEffectiveSubstatement(copy); @@ -85,27 +77,28 @@ public final class AugmentUtils { } private static void validateNodeCanBeCopiedByAugment(final StatementContextBase sourceCtx, - final List> targetSubStatements, final boolean sourceAndTargetInSameModule) { + final StatementContextBase targetCtx) { if (sourceCtx.getPublicDefinition().getDeclaredRepresentationClass().equals(WhenStatement.class)) { return; } - if (!sourceAndTargetInSameModule) { + if (reguiredCheckOfMandatoryNodes(sourceCtx, targetCtx)) { final List> sourceSubStatements = new Builder>() .addAll(sourceCtx.declaredSubstatements()).addAll(sourceCtx.effectiveSubstatements()).build(); for (final StatementContextBase sourceSubStatement : sourceSubStatements) { - if (sourceSubStatement.getPublicDefinition().getDeclaredRepresentationClass() - .equals(MandatoryStatement.class)) { - throw new InferenceException( - String.format( - "An augment cannot add node '%s' because it is mandatory and in module different from target", - sourceCtx.rawStatementArgument()), sourceCtx.getStatementSourceReference()); - } + InferenceException.throwIf(MandatoryStatement.class.equals( + sourceSubStatement.getPublicDefinition().getDeclaredRepresentationClass()), + sourceCtx.getStatementSourceReference(), + "An augment cannot add node '%s' because it is mandatory and in module different from target", + sourceCtx.rawStatementArgument()); } } + final List> targetSubStatements = new Builder>() + .addAll(targetCtx.declaredSubstatements()).addAll(targetCtx.effectiveSubstatements()).build(); + for (final StatementContextBase subStatement : targetSubStatements) { final boolean sourceIsDataNode = DataDefinitionStatement.class.isAssignableFrom(sourceCtx @@ -115,18 +108,58 @@ public final class AugmentUtils { boolean qNamesEqual = sourceIsDataNode && targetIsDataNode && Objects.equals(sourceCtx.getStatementArgument(), subStatement.getStatementArgument()); - if (qNamesEqual) { - throw new InferenceException(String.format( - "An augment cannot add node named '%s' because this name is already used in target", - sourceCtx.rawStatementArgument()), sourceCtx.getStatementSourceReference()); - } + InferenceException.throwIf(qNamesEqual, sourceCtx.getStatementSourceReference(), + "An augment cannot add node named '%s' because this name is already used in target", + sourceCtx.rawStatementArgument()); } } - private static final Set NOCOPY_DEV_SET = ImmutableSet.of(Rfc6020Mapping.USES); + private static boolean reguiredCheckOfMandatoryNodes(StatementContextBase sourceCtx, + StatementContextBase targetCtx) { + /* + * If the statement argument is not QName, it cannot be mandatory statement, + * therefore return false and skip mandatory nodes validation + */ + if(!(sourceCtx.getStatementArgument() instanceof QName)) { + return false; + } + QName sourceStmtQName = (QName) sourceCtx.getStatementArgument(); + + RootStatementContext root = targetCtx.getRoot(); + do { + Verify.verify(targetCtx.getStatementArgument() instanceof QName, + "Argument of augment target statement must be QName."); + QName targetStmtQName = (QName) targetCtx.getStatementArgument(); + /* + * If target is from another module, return true and perform + * mandatory nodes validation + */ + if (!Utils.belongsToTheSameModule(targetStmtQName, sourceStmtQName)) { + return true; + } else { + /* + * If target or one of its parent is a presence container from + * the same module, return false and skip mandatory nodes + * validation + */ + if (Utils.isPresenceContainer(targetCtx)) { + return false; + } + } + } while ((targetCtx = targetCtx.getParentContext()) != root); + + /* + * All target node's parents belong to the same module as source node, + * therefore return false and skip mandatory nodes validation. + */ + return false; + } + + private static final Set NOCOPY_DEF_SET = ImmutableSet.of(Rfc6020Mapping.USES, Rfc6020Mapping.WHEN, + Rfc6020Mapping.DESCRIPTION, Rfc6020Mapping.REFERENCE, Rfc6020Mapping.STATUS); public static boolean needToCopyByAugment(final StmtContext stmtContext) { - return !NOCOPY_DEV_SET.contains(stmtContext.getPublicDefinition()); + return !NOCOPY_DEF_SET.contains(stmtContext.getPublicDefinition()); } private static final Set REUSED_DEF_SET = ImmutableSet.of(Rfc6020Mapping.TYPEDEF); @@ -138,7 +171,7 @@ public final class AugmentUtils { static boolean isSupportedAugmentTarget(final StatementContextBase substatementCtx) { /* - * :TODO Substatement must be allowed augment target type e.g. Container, etc... and must be not for example + * :TODO Substatement must be allowed augment target type e.g. Container, etc... and must not be for example * grouping, identity etc. It is problem in case when more than one substatements have the same QName, for * example Grouping and Container are siblings and they have the same QName. We must find the Container and the * Grouping must be ignored as disallowed augment target.