import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.NotThreadSafe;
-import org.opendaylight.yangtools.concepts.Identifiable;
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.ModificationType;
* to the data store tree.
*
* This tree is lazily created and populated via {@link #modifyChild(PathArgument)}
- * and {@link StoreMetadataNode} which represents original state {@link #getOriginal()}.
+ * and {@link TreeNode} which represents original state as tracked by {@link #getOriginal()}.
*/
@NotThreadSafe
-final class ModifiedNode implements StoreTreeNode<ModifiedNode>, Identifiable<PathArgument>, NodeModification {
-
- public static final Predicate<ModifiedNode> IS_TERMINAL_PREDICATE = new Predicate<ModifiedNode>() {
+final class ModifiedNode extends NodeModification implements StoreTreeNode<ModifiedNode> {
+ static final Predicate<ModifiedNode> IS_TERMINAL_PREDICATE = new Predicate<ModifiedNode>() {
@Override
public boolean apply(final @Nonnull ModifiedNode input) {
Preconditions.checkNotNull(input);
}
/**
+ * Return the value which was written to this node.
*
- *
- * @return
+ * @return Currently-written value
*/
public NormalizedNode<?, ?> getWrittenValue() {
return value;
* @return original store metadata
*/
@Override
- public Optional<TreeNode> getOriginal() {
+ Optional<TreeNode> getOriginal() {
return original;
}
* @return modification type
*/
@Override
- public ModificationType getType() {
+ ModificationType getType() {
return modificationType;
}
/**
*
- * Returns child modification if child was modified, creates {@link org.opendaylight.controller.md.sal.dom.store.impl.tree.data.ModifiedNode}
+ * Returns child modification if child was modified, creates {@link ModifiedNode}
* for child otherwise.
*
* If this node's {@link ModificationType} is {@link ModificationType#UNMODIFIED}
* changes modification type to {@link ModificationType#SUBTREE_MODIFIED}
*
* @param child
- * @return {@link org.opendaylight.controller.md.sal.dom.store.impl.tree.data.ModifiedNode} for specified child, with {@link #getOriginal()}
+ * @return {@link ModifiedNode} for specified child, with {@link #getOriginal()}
* containing child metadata if child was present in original data.
*/
- public ModifiedNode modifyChild(final PathArgument child, final boolean isOrdered) {
+ ModifiedNode modifyChild(final PathArgument child, final boolean isOrdered) {
clearSnapshot();
if (modificationType == ModificationType.UNMODIFIED) {
updateModificationType(ModificationType.SUBTREE_MODIFIED);
currentMetadata = Optional.absent();
}
- ModifiedNode newlyCreated = new ModifiedNode(child, currentMetadata, isOrdered);
+ final ModifiedNode newlyCreated = new ModifiedNode(child, currentMetadata, isOrdered);
children.put(child, newlyCreated);
return newlyCreated;
}
/**
- *
* Returns all recorded direct child modification
*
* @return all recorded direct child modifications
*/
@Override
- public Iterable<ModifiedNode> getChildren() {
+ Collection<ModifiedNode> getChildren() {
return children.values();
}
/**
- *
* Records a delete for associated node.
- *
*/
- public void delete() {
+ void delete() {
final ModificationType newType;
switch (modificationType) {
}
/**
- *
* Records a write for associated node.
*
* @param value
*/
- public void write(final NormalizedNode<?, ?> value) {
+ void write(final NormalizedNode<?, ?> value) {
clearSnapshot();
updateModificationType(ModificationType.WRITE);
children.clear();
this.value = value;
}
- public void merge(final NormalizedNode<?, ?> data) {
+ void merge(final NormalizedNode<?, ?> value) {
clearSnapshot();
updateModificationType(ModificationType.MERGE);
- // FIXME: Probably merge with previous value.
- this.value = data;
+
+ /*
+ * Blind overwrite of any previous data is okay, no matter whether the node
+ * is simple or complex type.
+ *
+ * If this is a simple or complex type with unkeyed children, this merge will
+ * be turned into a write operation, overwriting whatever was there before.
+ *
+ * If this is a container with keyed children, there are two possibilities:
+ * - if it existed before, this value will never be consulted and the children
+ * will get explicitly merged onto the original data.
+ * - if it did not exist before, this value will be used as a seed write and
+ * children will be merged into it.
+ * In either case we rely on OperationWithModification to manipulate the children
+ * before calling this method, so unlike a write we do not want to clear them.
+ */
+ this.value = value;
}
/**
snapshotCache = null;
}
- public Optional<TreeNode> storeSnapshot(final Optional<TreeNode> snapshot) {
- snapshotCache = snapshot;
- return snapshot;
+ Optional<TreeNode> getSnapshot() {
+ return snapshotCache;
}
- public Optional<Optional<TreeNode>> getSnapshotCache() {
- return Optional.fromNullable(snapshotCache);
+ Optional<TreeNode> setSnapshot(final Optional<TreeNode> snapshot) {
+ snapshotCache = Preconditions.checkNotNull(snapshot);
+ return snapshot;
}
private void updateModificationType(final ModificationType type) {
Code Review / yangtools.git / blobdiff