import com.google.common.base.Preconditions;
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.NormalizedNodeContainer;
import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version;
applyOperation.verifyStructure(value, false);
}
- private void recursiveMerge(final NormalizedNode<?,?> data) {
- if (data instanceof NormalizedNodeContainer) {
- @SuppressWarnings({ "rawtypes", "unchecked" })
- final
- NormalizedNodeContainer<?,?,NormalizedNode<PathArgument, ?>> dataContainer = (NormalizedNodeContainer) data;
-
- /*
- * if there was write before on this node and it is of NormalizedNodeContainer type
- * merge would overwrite our changes. So we create write modifications from data children to
- * retain children created by past write operation.
- * These writes will then be pushed down in the tree while there are merge modifications on these children
- */
- if (modification.getOperation() == LogicalOperation.WRITE) {
- @SuppressWarnings({ "rawtypes", "unchecked" })
- final
- NormalizedNodeContainer<?,?,NormalizedNode<PathArgument, ?>> odlDataContainer =
- (NormalizedNodeContainer) modification.getWrittenValue();
- for (final NormalizedNode<PathArgument, ?> child : odlDataContainer.getValue()) {
- final PathArgument childId = child.getIdentifier();
- forChild(childId).write(child);
- }
- }
- for (final NormalizedNode<PathArgument, ?> child : dataContainer.getValue()) {
- final PathArgument childId = child.getIdentifier();
- forChild(childId).recursiveMerge(child);
- }
- }
-
- modification.merge(data);
- }
-
- void merge(final NormalizedNode<?, ?> data) {
+ void merge(final NormalizedNode<?, ?> data, final Version version) {
/*
* A merge operation will end up overwriting parts of the tree, retaining others. We want to
* make sure we do not validate the complete resulting structure, but rather just what was
* written. In order to do that, we first pretend the data was written, run verification and
* then perform the merge -- with the explicit assumption that adding the newly-validated
* data with the previously-validated data will not result in invalid data.
- *
- * FIXME: Should be this moved to recursive merge and run for each node?
*/
- applyOperation.verifyStructure(data, false);
- recursiveMerge(data);
+ applyOperation.verifyStructure(data, true);
+ applyOperation.mergeIntoModifiedNode(modification, data, version);
}
void delete() {
final ModifiedNode modification) {
return new OperationWithModification(operation, modification);
}
-
- private OperationWithModification forChild(final PathArgument childId) {
- final Optional<ModificationApplyOperation> maybeChildOp = applyOperation.getChild(childId);
- Preconditions.checkArgument(maybeChildOp.isPresent(), "Attempted to apply operation to non-existent child %s", childId);
-
- final ModificationApplyOperation childOp = maybeChildOp.get();
- final ModifiedNode childMod = modification.modifyChild(childId, childOp.getChildPolicy());
-
- return from(childOp, childMod);
- }
}