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=c835eb24febd2d5f787dbd73294de9bcb6732515;hb=04fa25a4fe8957f6492618aa9a1e9a4f9af39df4;hp=373ec1f40e78b894f4b0e12620c864e6c57c94d1;hpb=c4dc5b33e7d24670b59cc81b65e15b37a3268608;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 373ec1f40e..c835eb24fe 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 @@ -1,68 +1,59 @@ /** * 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.stmt.rfc6020; +import com.google.common.collect.ImmutableList.Builder; +import com.google.common.collect.ImmutableSet; import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedList; import java.util.List; -import java.util.Map; +import java.util.Objects; import java.util.Set; - -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping; -import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition; -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.DataDefinitionStatement; +import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UsesStatement; -import org.opendaylight.yangtools.yang.parser.spi.NamespaceToModule; +import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement; +import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; -import org.opendaylight.yangtools.yang.parser.spi.source.ModuleNameToModuleQName; +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.StatementContextBase; +// FIXME: Move this to the AugmentStatementDefinition#ApplyAction public final class AugmentUtils { - - private static final String REGEX_PATH_REL1 = "\\.\\.?\\s*/(.+)"; - private static final String REGEX_PATH_REL2 = "//.*"; - private AugmentUtils() { } - public static Iterable parseAugmentPath(StmtContext ctx, String path) { - - if (path.matches(REGEX_PATH_REL1) || path.matches(REGEX_PATH_REL2)) { - throw new IllegalArgumentException( - "An argument for augment can be only absolute path; or descendant if used in uses"); - } - - return Utils.parseXPath(ctx, path); + public static void copyFromSourceToTarget(final StatementContextBase sourceCtx, + final StatementContextBase targetCtx) throws SourceException { + copyDeclaredStmts(sourceCtx, targetCtx); + copyEffectiveStmts(sourceCtx, targetCtx); } - public static void copyFromSourceToTarget(StatementContextBase sourceCtx, - StatementContextBase targetCtx) throws SourceException { + // FIXME: Declared statements should not be copied. + private static void copyDeclaredStmts(final StatementContextBase sourceCtx, + final StatementContextBase targetCtx) throws SourceException { - QNameModule newQNameModule = getNewQNameModule(targetCtx, sourceCtx); - copyDeclaredStmts(sourceCtx, targetCtx, newQNameModule); - copyEffectiveStmts(sourceCtx, targetCtx, newQNameModule); + 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; - public static void copyDeclaredStmts(StatementContextBase sourceCtx, - StatementContextBase targetCtx, QNameModule newQNameModule) throws SourceException { - Collection> declaredSubstatements = sourceCtx.declaredSubstatements(); - for (StatementContextBase originalStmtCtx : declaredSubstatements) { + for (StatementContextBase originalStmtCtx : sourceCtx.declaredSubstatements()) { if (needToCopyByAugment(originalStmtCtx)) { - StatementContextBase copy = originalStmtCtx.createCopy(newQNameModule, targetCtx); + validateNodeCanBeCopiedByAugment(originalStmtCtx, subStatements, sourceAndTargetInSameModule); + + StatementContextBase copy = originalStmtCtx.createCopy(targetCtx, typeOfCopy); targetCtx.addEffectiveSubstatement(copy); } else if (isReusedByAugment(originalStmtCtx)) { targetCtx.addEffectiveSubstatement(originalStmtCtx); @@ -70,12 +61,22 @@ public final class AugmentUtils { } } - public static void copyEffectiveStmts(StatementContextBase sourceCtx, - StatementContextBase targetCtx, QNameModule newQNameModule) throws SourceException { - Collection> effectiveSubstatements = sourceCtx.effectiveSubstatements(); - for (StatementContextBase originalStmtCtx : effectiveSubstatements) { + 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)) { - StatementContextBase copy = originalStmtCtx.createCopy(newQNameModule, targetCtx); + validateNodeCanBeCopiedByAugment(originalStmtCtx, subStatements, sourceAndTargetInSameModule); + + StatementContextBase copy = originalStmtCtx.createCopy(targetCtx, typeOfCopy); targetCtx.addEffectiveSubstatement(copy); } else if (isReusedByAugment(originalStmtCtx)) { targetCtx.addEffectiveSubstatement(originalStmtCtx); @@ -83,102 +84,67 @@ public final class AugmentUtils { } } - public static QNameModule getNewQNameModule(StatementContextBase targetCtx, - StatementContextBase sourceCtx) { - Object targetStmtArgument = targetCtx.getStatementArgument(); + private static void validateNodeCanBeCopiedByAugment(final StatementContextBase sourceCtx, + final List> targetSubStatements, final boolean sourceAndTargetInSameModule) { - final StatementContextBase root = sourceCtx.getRoot(); - final String moduleName = (String) root.getStatementArgument(); - final QNameModule sourceQNameModule = root.getFromNamespace(ModuleNameToModuleQName.class, moduleName); + if (sourceCtx.getPublicDefinition().getDeclaredRepresentationClass().equals(WhenStatement.class)) { + return; + } - if (targetStmtArgument instanceof QName) { - QName targetQName = (QName) targetStmtArgument; - QNameModule targetQNameModule = targetQName.getModule(); + if (!sourceAndTargetInSameModule) { + final List> sourceSubStatements = new Builder>() + .addAll(sourceCtx.declaredSubstatements()).addAll(sourceCtx.effectiveSubstatements()).build(); - if (targetQNameModule.equals(sourceQNameModule)) { - return null; - } else { - return targetQNameModule; + for (final StatementContextBase sourceSubStatement : sourceSubStatements) { + 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()); } - } else { - return null; } - } - public static boolean needToCopyByAugment(StmtContext stmtContext) { + for (final StatementContextBase subStatement : targetSubStatements) { - Set noCopyDefSet = new HashSet<>(); - noCopyDefSet.add(Rfc6020Mapping.USES); + final boolean sourceIsDataNode = DataDefinitionStatement.class.isAssignableFrom(sourceCtx + .getPublicDefinition().getDeclaredRepresentationClass()); + final boolean targetIsDataNode = DataDefinitionStatement.class.isAssignableFrom(subStatement + .getPublicDefinition().getDeclaredRepresentationClass()); + boolean qNamesEqual = sourceIsDataNode && targetIsDataNode + && Objects.equals(sourceCtx.getStatementArgument(), subStatement.getStatementArgument()); - StatementDefinition def = stmtContext.getPublicDefinition(); - return !noCopyDefSet.contains(def); + InferenceException.throwIf(qNamesEqual, sourceCtx.getStatementSourceReference(), + "An augment cannot add node named '%s' because this name is already used in target", + sourceCtx.rawStatementArgument()); + } } - public static boolean isReusedByAugment(StmtContext stmtContext) { - - Set reusedDefSet = new HashSet<>(); - reusedDefSet.add(Rfc6020Mapping.TYPEDEF); - - StatementDefinition def = stmtContext.getPublicDefinition(); + private static final Set NOCOPY_DEV_SET = ImmutableSet.of(Rfc6020Mapping.USES); - return reusedDefSet.contains(def); + public static boolean needToCopyByAugment(final StmtContext stmtContext) { + return !NOCOPY_DEV_SET.contains(stmtContext.getPublicDefinition()); } - public static StatementContextBase getAugmentTargetCtx( - final Mutable> augmentNode) { - - final SchemaNodeIdentifier augmentTargetNode = augmentNode.getStatementArgument(); - - List> rootStatementCtxList = new LinkedList<>(); - - if (augmentTargetNode.isAbsolute()) { - - QNameModule module; - if (augmentTargetNode != null) { - module = augmentTargetNode.getPathFromRoot().iterator().next().getModule(); - } else { - throw new IllegalArgumentException( - "Augment argument null, something bad happened in some of previous parsing phases"); - } - - StatementContextBase rootStatementCtx = (StatementContextBase) augmentNode.getFromNamespace( - NamespaceToModule.class, module); - rootStatementCtxList.add(rootStatementCtx); - - final Map subModules = rootStatementCtx.getAllFromNamespace(IncludedModuleContext.class); - if (subModules != null) { - rootStatementCtxList.addAll((Collection>) subModules.values()); - } - - } else { - StatementContextBase parent = (StatementContextBase) augmentNode.getParentContext(); - if (StmtContextUtils.producesDeclared(parent, UsesStatement.class)) { - rootStatementCtxList.add(parent.getParentContext()); - } else { - //error - } - } - - List augmentTargetPath = new LinkedList<>(); - - augmentTargetPath.addAll((Collection) augmentTargetNode.getPathFromRoot()); - - StatementContextBase augmentTargetCtx = null; - for (final StatementContextBase rootStatementCtx : rootStatementCtxList) { - augmentTargetCtx = Utils.findCtxOfNodeInRoot(rootStatementCtx, - augmentTargetPath); - if (augmentTargetCtx != null) break; - } + private static final Set REUSED_DEF_SET = ImmutableSet.of(Rfc6020Mapping.TYPEDEF); + public static boolean isReusedByAugment(final StmtContext stmtContext) { + return REUSED_DEF_SET.contains(stmtContext.getPublicDefinition()); + } - if (augmentTargetCtx == null) { + static boolean isSupportedAugmentTarget(final StatementContextBase substatementCtx) { - throw new NullPointerException(String.format( - "Augment path %s not found in target model so its resulting context is null", - augmentNode.rawStatementArgument())); + /* + * :TODO Substatement must be allowed augment target type e.g. Container, etc... and must be not 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. + */ - } + Collection allowedAugmentTargets = substatementCtx.getFromNamespace(ValidationBundlesNamespace.class, + ValidationBundleType.SUPPORTED_AUGMENT_TARGETS); - return augmentTargetCtx; + // if no allowed target is returned we consider all targets allowed + return allowedAugmentTargets == null || allowedAugmentTargets.isEmpty() + || allowedAugmentTargets.contains(substatementCtx.getPublicDefinition()); } }