import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.tree.ConflictingModificationAppliedException;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.IncorrectDataStructureException;
import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version;
import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
abstract class SchemaAwareApplyOperation extends ModificationApplyOperation {
private static final Logger LOG = LoggerFactory.getLogger(SchemaAwareApplyOperation.class);
- public static SchemaAwareApplyOperation from(final DataSchemaNode schemaNode) {
+ public static ModificationApplyOperation from(final DataSchemaNode schemaNode, final TreeType treeType) {
+ if (treeType == TreeType.CONFIGURATION) {
+ Preconditions.checkArgument(schemaNode.isConfiguration(), "Supplied %s does not belongs to configuration tree.", schemaNode.getPath());
+ }
if (schemaNode instanceof ContainerSchemaNode) {
- return new ContainerModificationStrategy((ContainerSchemaNode) schemaNode);
+ final ContainerSchemaNode containerSchema = (ContainerSchemaNode) schemaNode;
+ if (containerSchema.isPresenceContainer()) {
+ return new PresenceContainerModificationStrategy(containerSchema, treeType);
+ } else {
+ return new StructuralContainerModificationStrategy(containerSchema, treeType);
+ }
} else if (schemaNode instanceof ListSchemaNode) {
- return fromListSchemaNode((ListSchemaNode) schemaNode);
+ return fromListSchemaNode((ListSchemaNode) schemaNode, treeType);
} else if (schemaNode instanceof ChoiceSchemaNode) {
- return new ChoiceModificationStrategy((ChoiceSchemaNode) schemaNode);
+ return new ChoiceModificationStrategy((ChoiceSchemaNode) schemaNode, treeType);
} else if (schemaNode instanceof LeafListSchemaNode) {
- return fromLeafListSchemaNode((LeafListSchemaNode) schemaNode);
+ return fromLeafListSchemaNode((LeafListSchemaNode) schemaNode, treeType);
} else if (schemaNode instanceof LeafSchemaNode) {
- return new LeafModificationStrategy((LeafSchemaNode) schemaNode);
+ return new LeafModificationStrategy((LeafSchemaNode) schemaNode, treeType);
}
throw new IllegalArgumentException("Not supported schema node type for " + schemaNode.getClass());
}
public static SchemaAwareApplyOperation from(final DataNodeContainer resolvedTree,
- final AugmentationTarget augSchemas, final AugmentationIdentifier identifier) {
+ final AugmentationTarget augSchemas, final AugmentationIdentifier identifier, final TreeType treeType) {
for (final AugmentationSchema potential : augSchemas.getAvailableAugmentations()) {
for (final DataSchemaNode child : potential.getChildNodes()) {
if (identifier.getPossibleChildNames().contains(child.getQName())) {
- return new AugmentationModificationStrategy(potential, resolvedTree);
+ return new AugmentationModificationStrategy(potential, resolvedTree, treeType);
}
}
}
return condition;
}
- private static SchemaAwareApplyOperation fromListSchemaNode(final ListSchemaNode schemaNode) {
+ private static SchemaAwareApplyOperation fromListSchemaNode(final ListSchemaNode schemaNode, final TreeType treeType) {
final List<QName> keyDefinition = schemaNode.getKeyDefinition();
final SchemaAwareApplyOperation op;
if (keyDefinition == null || keyDefinition.isEmpty()) {
- op = new UnkeyedListModificationStrategy(schemaNode);
+ op = new UnkeyedListModificationStrategy(schemaNode, treeType);
} else if (schemaNode.isUserOrdered()) {
- op = new OrderedMapModificationStrategy(schemaNode);
+ op = new OrderedMapModificationStrategy(schemaNode, treeType);
} else {
- op = new UnorderedMapModificationStrategy(schemaNode);
+ op = new UnorderedMapModificationStrategy(schemaNode, treeType);
}
return MinMaxElementsValidation.from(op, schemaNode);
}
- private static SchemaAwareApplyOperation fromLeafListSchemaNode(final LeafListSchemaNode schemaNode) {
+ private static SchemaAwareApplyOperation fromLeafListSchemaNode(final LeafListSchemaNode schemaNode, final TreeType treeType) {
final SchemaAwareApplyOperation op;
if(schemaNode.isUserOrdered()) {
- op = new OrderedLeafSetModificationStrategy(schemaNode);
+ op = new OrderedLeafSetModificationStrategy(schemaNode, treeType);
} else {
- op = new UnorderedLeafSetModificationStrategy(schemaNode);
+ op = new UnorderedLeafSetModificationStrategy(schemaNode, treeType);
}
return MinMaxElementsValidation.from(op, schemaNode);
}
}
@Override
- void verifyStructure(final ModifiedNode modification) throws IllegalArgumentException {
- if (modification.getOperation() == LogicalOperation.WRITE) {
- verifyWrittenStructure(modification.getWrittenValue());
- }
- }
-
- @Override
- final void checkApplicable(final YangInstanceIdentifier path,final NodeModification modification, final Optional<TreeNode> current) throws DataValidationFailedException {
+ final void checkApplicable(final YangInstanceIdentifier path,final NodeModification modification, final Optional<TreeNode> current, final Version version) throws DataValidationFailedException {
switch (modification.getOperation()) {
case DELETE:
checkDeleteApplicable(modification, current);
break;
case TOUCH:
- checkTouchApplicable(path, modification, current);
+ checkTouchApplicable(path, modification, current, version);
break;
case WRITE:
- checkWriteApplicable(path, modification, current);
+ checkWriteApplicable(path, modification, current, version);
break;
case MERGE:
- checkMergeApplicable(path, modification, current);
+ checkMergeApplicable(path, modification, current, version);
break;
case NONE:
break;
}
}
- protected void checkMergeApplicable(final YangInstanceIdentifier path, final NodeModification modification, final Optional<TreeNode> current) throws DataValidationFailedException {
+ protected void checkMergeApplicable(final YangInstanceIdentifier path, final NodeModification modification,
+ final Optional<TreeNode> current, final Version version) throws DataValidationFailedException {
final Optional<TreeNode> original = modification.getOriginal();
if (original.isPresent() && current.isPresent()) {
/*
* @throws DataValidationFailedException
*/
protected void checkWriteApplicable(final YangInstanceIdentifier path, final NodeModification modification,
- final Optional<TreeNode> current) throws DataValidationFailedException {
+ final Optional<TreeNode> current, final Version version) throws DataValidationFailedException {
final Optional<TreeNode> original = modification.getOriginal();
if (original.isPresent() && current.isPresent()) {
checkNotConflicting(path, original.get(), current.get());
} else if(original.isPresent()) {
throw new ConflictingModificationAppliedException(path,"Node was deleted by other transaction.");
- } else if(current.isPresent()) {
- throw new ConflictingModificationAppliedException(path,"Node was created by other transaction.");
+ } else if (current.isPresent()) {
+ throw new ConflictingModificationAppliedException(path, "Node was created by other transaction.");
}
}
private static void checkDeleteApplicable(final NodeModification modification, final Optional<TreeNode> current) {
// Delete is always applicable, we do not expose it to subclasses
- if (current.isPresent()) {
+ if (!current.isPresent()) {
LOG.trace("Delete operation turned to no-op on missing node {}", modification);
}
}
final Optional<TreeNode> apply(final ModifiedNode modification, final Optional<TreeNode> currentMeta, final Version version) {
switch (modification.getOperation()) {
case DELETE:
- modification.resolveModificationType(ModificationType.DELETE);
+ // Deletion of a non-existing node is a no-op, report it as such
+ modification.resolveModificationType(currentMeta.isPresent() ? ModificationType.DELETE : ModificationType.UNMODIFIED);
return modification.setSnapshot(Optional.<TreeNode> absent());
case TOUCH:
Preconditions.checkArgument(currentMeta.isPresent(), "Metadata not available for modification %s",
// This is a slight optimization: a merge on a non-existing node equals to a write
if (currentMeta.isPresent()) {
- result = applyMerge(modification,currentMeta.get(), version);
+ result = applyMerge(modification, currentMeta.get(), version);
} else {
modification.resolveModificationType(ModificationType.WRITE);
result = applyWrite(modification, currentMeta, version);
* @throws ConflictingModificationAppliedException If subtree was changed in conflicting way
* @throws IncorrectDataStructureException If subtree modification is not applicable (e.g. leaf node).
*/
- protected abstract void checkTouchApplicable(YangInstanceIdentifier path, final NodeModification modification,
- final Optional<TreeNode> current) throws DataValidationFailedException;
+ protected abstract void checkTouchApplicable(YangInstanceIdentifier path, NodeModification modification,
+ Optional<TreeNode> current, Version version) throws DataValidationFailedException;
- protected abstract void verifyWrittenStructure(NormalizedNode<?, ?> writtenValue);
+ /**
+ * Checks if supplied schema node belong to specified Data Tree type. All nodes belong to the operational tree,
+ * nodes in configuration tree are marked as such.
+ *
+ * @param treeType Tree Type
+ * @param node Schema node
+ * @return
+ */
+ static boolean belongsToTree(final TreeType treeType, final DataSchemaNode node) {
+ return treeType == TreeType.OPERATIONAL || node.isConfiguration();
+ }
}
Code Review / yangtools.git / blobdiff