import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
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;
abstract class SchemaAwareApplyOperation extends ModificationApplyOperation {
private static final Logger LOG = LoggerFactory.getLogger(SchemaAwareApplyOperation.class);
- static SchemaAwareApplyOperation from(final ContainerSchemaNode schemaNode, final TreeType treeType) {
- return new ContainerModificationStrategy(schemaNode, treeType);
- }
-
- public static SchemaAwareApplyOperation from(final DataSchemaNode schemaNode, final TreeType treeType) {
- if(treeType == TreeType.CONFIGURATION) {
+ 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, treeType);
+ 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, treeType);
} else if (schemaNode instanceof ChoiceSchemaNode) {
return null;
}
- public static boolean checkConflicting(final YangInstanceIdentifier path, final boolean condition, final String message) throws ConflictingModificationAppliedException {
- if(!condition) {
+ public static void checkConflicting(final YangInstanceIdentifier path, final boolean condition,
+ final String message) throws ConflictingModificationAppliedException {
+ if (!condition) {
throw new ConflictingModificationAppliedException(path, message);
}
- return condition;
}
private static SchemaAwareApplyOperation fromListSchemaNode(final ListSchemaNode schemaNode, final TreeType treeType) {
return MinMaxElementsValidation.from(op, schemaNode);
}
- protected static final void checkNotConflicting(final YangInstanceIdentifier path, final TreeNode original, final TreeNode current) throws ConflictingModificationAppliedException {
+ protected static void checkNotConflicting(final YangInstanceIdentifier path, final TreeNode original, final TreeNode current) throws ConflictingModificationAppliedException {
checkConflicting(path, original.getVersion().equals(current.getVersion()),
"Node was replaced by other transaction.");
checkConflicting(path, original.getSubtreeVersion().equals(current.getSubtreeVersion()),
}
@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.");
}
}
case 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());
+ return modification.setSnapshot(Optional.absent());
case TOUCH:
Preconditions.checkArgument(currentMeta.isPresent(), "Metadata not available for modification %s",
modification);
// 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);
* @param modification Node modification which should be applied.
* @param current Current state of data tree
* @throws ConflictingModificationAppliedException If subtree was changed in conflicting way
- * @throws IncorrectDataStructureException If subtree modification is not applicable (e.g. leaf node).
+ * @throws org.opendaylight.yangtools.yang.data.api.schema.tree.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;
/**
- * Checks if supplied schema node belong to specified Data Tree type.
+ * 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
+ * @return {@code true} if the node matches the tree type, {@code false} otherwise.
*/
static boolean belongsToTree(final TreeType treeType, final DataSchemaNode node) {
- if(treeType == TreeType.CONFIGURATION) {
- return node.isConfiguration();
- }
- return true;
+ return treeType == TreeType.OPERATIONAL || node.isConfiguration();
}
}
Code Review / yangtools.git / blobdiff