import static java.util.Objects.requireNonNull;
import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Verify;
+import com.google.common.base.VerifyException;
import java.util.Collection;
-import java.util.Optional;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.DistinctNodeContainer;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer;
/**
* Fake TreeNode version used in
- * {@link #checkTouchApplicable(ModificationPath, NodeModification, Optional, Version)}
+ * {@link #checkTouchApplicable(ModificationPath, NodeModification, TreeNode, Version)}
* It is okay to use a global constant, as the delegate will ignore it anyway.
*/
private static final Version FAKE_VERSION = Version.initial();
@Override
protected TreeNode applyWrite(final ModifiedNode modification, final NormalizedNode newValue,
- final Optional<? extends TreeNode> currentMeta, final Version version) {
+ final TreeNode currentMeta, final Version version) {
final var newValueMeta = TreeNode.of(newValue, version);
if (modification.isEmpty()) {
return newValueMeta;
@SuppressWarnings({ "rawtypes", "unchecked" })
private TreeNode mutateChildren(final MutableTreeNode meta, final NormalizedNodeContainerBuilder data,
final Version nodeVersion, final Iterable<ModifiedNode> modifications) {
-
- for (final ModifiedNode mod : modifications) {
- final PathArgument id = mod.getIdentifier();
- final Optional<? extends TreeNode> cm = meta.findChildByArg(id);
-
- final Optional<? extends TreeNode> result = resolveChildOperation(id).apply(mod, cm, nodeVersion);
- if (result.isPresent()) {
- final TreeNode tn = result.orElseThrow();
- meta.putChild(tn);
- data.addChild(tn.getData());
+ for (var mod : modifications) {
+ final var id = mod.getIdentifier();
+ final var result = resolveChildOperation(id).apply(mod, meta.childByArg(id), nodeVersion);
+ if (result != null) {
+ meta.putChild(result);
+ data.addChild(result.getData());
} else {
meta.removeChild(id);
data.removeChild(id);
* we do that, ModifiedNode children will look like this node were a TOUCH and we will let applyTouch() do the
* heavy lifting of applying the children recursively (either through here or through applyWrite().
*/
- final NormalizedNode value = modification.getWrittenValue();
+ final var value = modification.getWrittenValue();
+ if (!(value instanceof DistinctNodeContainer<?, ?> containerValue)) {
+ throw new VerifyException("Attempted to merge non-container " + value);
+ }
- Verify.verify(value instanceof DistinctNodeContainer, "Attempted to merge non-container %s", value);
- for (var c : ((DistinctNodeContainer<?, ?>) value).body()) {
+ for (var c : containerValue.body()) {
final var id = c.name();
modification.modifyChild(id, resolveChildOperation(id), version);
}
// and then append any child entries.
if (!modification.isEmpty()) {
// Version does not matter here as we'll throw it out
- final var current = apply(modification, modification.getOriginal(), Version.initial());
- if (current.isPresent()) {
- modification.updateValue(LogicalOperation.WRITE, current.orElseThrow().getData());
+ final var current = apply(modification, modification.original(), Version.initial());
+ if (current != null) {
+ modification.updateValue(LogicalOperation.WRITE, current.getData());
mergeChildrenIntoModification(modification, valueChildren, version);
return;
}
@Override
protected final void checkTouchApplicable(final ModificationPath path, final NodeModification modification,
- final Optional<? extends TreeNode> current, final Version version) throws DataValidationFailedException {
+ final TreeNode currentMeta, final Version version) throws DataValidationFailedException {
final TreeNode currentNode;
- if (current.isEmpty()) {
+ if (currentMeta == null) {
currentNode = defaultTreeNode();
if (currentNode == null) {
- if (modification.getOriginal().isEmpty()) {
- final YangInstanceIdentifier id = path.toInstanceIdentifier();
+ if (modification.original() == null) {
+ final var id = path.toInstanceIdentifier();
throw new ModifiedNodeDoesNotExistException(id,
"Node " + id + " does not exist. Cannot apply modification to its children.");
}
"Node was deleted by other transaction.");
}
} else {
- currentNode = current.orElseThrow();
+ currentNode = currentMeta;
}
checkChildPreconditions(path, modification, currentNode, version);
@Override
protected final void checkMergeApplicable(final ModificationPath path, final NodeModification modification,
- final Optional<? extends TreeNode> current, final Version version) throws DataValidationFailedException {
- if (current.isPresent()) {
- checkChildPreconditions(path, modification, current.orElseThrow(), version);
+ final TreeNode currentMeta, final Version version) throws DataValidationFailedException {
+ if (currentMeta != null) {
+ checkChildPreconditions(path, modification, currentMeta, version);
}
}
*
* @param path current node path
* @param modification current modification
- * @param current Current data tree node.
+ * @param currentMeta Current data tree node.
*/
private void checkChildPreconditions(final ModificationPath path, final NodeModification modification,
- final TreeNode current, final Version version) throws DataValidationFailedException {
- for (final NodeModification childMod : modification.getChildren()) {
- final PathArgument childId = childMod.getIdentifier();
- final Optional<? extends TreeNode> childMeta = current.findChildByArg(childId);
+ final @NonNull TreeNode currentMeta, final Version version) throws DataValidationFailedException {
+ for (var childMod : modification.getChildren()) {
+ final var childId = childMod.getIdentifier();
+ final var childMeta = currentMeta.childByArg(childId);
path.push(childId);
try {
Code Review / yangtools.git / blobdiff