X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fimpl%2Fschema%2Ftree%2FAbstractModifiedNodeBasedCandidateNode.java;h=02d961eed3c05d1fb0dd1dfd802623b01dfa4252;hb=refs%2Fchanges%2F89%2F56089%2F1;hp=25fb2df24078880b78bb1ad3f2ec3600899fad72;hpb=5acf7cad49f7490a10b7c8e20f891dfb23ce9a0b;p=yangtools.git diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java index 25fb2df240..02d961eed3 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java @@ -1,18 +1,18 @@ /* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2015, 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ package org.opendaylight.yangtools.yang.data.impl.schema.tree; -import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.collect.Collections2; +import com.google.common.collect.ImmutableList; import java.util.Collection; -import java.util.Collections; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -22,20 +22,12 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandidateNode { - - private static final Function, DataTreeCandidateNode> TO_UNMODIFIED_NODE = new Function, DataTreeCandidateNode>() { - @Override - public DataTreeCandidateNode apply(final NormalizedNode input) { - return AbstractRecursiveCandidateNode.unmodifiedNode(input); - } - }; - private final ModifiedNode mod; private final TreeNode newMeta; private final TreeNode oldMeta; - protected AbstractModifiedNodeBasedCandidateNode(final ModifiedNode mod, - final TreeNode oldMeta, final TreeNode newMeta) { + protected AbstractModifiedNodeBasedCandidateNode(final ModifiedNode mod, final TreeNode oldMeta, + final TreeNode newMeta) { this.newMeta = newMeta; this.oldMeta = oldMeta; this.mod = Preconditions.checkNotNull(mod); @@ -54,11 +46,7 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida } private static TreeNode childMeta(final TreeNode parent, final PathArgument id) { - if (parent != null) { - return parent.getChild(id).orNull(); - } else { - return null; - } + return parent == null ? null : parent.getChild(id).orNull(); } private static boolean canHaveChildren(@Nullable final TreeNode oldMeta, @Nullable final TreeNode newMeta) { @@ -82,56 +70,53 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida } @Override + @Nonnull public Collection getChildNodes() { switch (mod.getModificationType()) { + case APPEARED: + case DISAPPEARED: case SUBTREE_MODIFIED: - return Collections2.transform(mod.getChildren(), new Function() { - @Override - public DataTreeCandidateNode apply(final ModifiedNode input) { - return childNode(input); - } - }); + return Collections2.transform(mod.getChildren(), this::childNode); case UNMODIFIED: // Unmodified node, but we still need to resolve potential children. canHaveChildren returns // false if both arguments are null. - if (canHaveChildren(oldMeta, newMeta)) { - return Collections2.transform(getContainer(newMeta != null ? newMeta : oldMeta).getValue(), TO_UNMODIFIED_NODE); - } else { - return Collections.emptyList(); + if (!canHaveChildren(oldMeta, newMeta)) { + return ImmutableList.of(); } + + return Collections2.transform(getContainer(newMeta != null ? newMeta : oldMeta).getValue(), + AbstractRecursiveCandidateNode::unmodifiedNode); case DELETE: case WRITE: // This is unusual, the user is requesting we follow into an otherwise-terminal node. // We need to fudge things based on before/after data to correctly fake the expectations. - if (canHaveChildren(oldMeta, newMeta)) { - return AbstractDataTreeCandidateNode.deltaChildren(getContainer(oldMeta), getContainer(newMeta)); - } else { - return Collections.emptyList(); + if (!canHaveChildren(oldMeta, newMeta)) { + return ImmutableList.of(); } + return AbstractDataTreeCandidateNode.deltaChildren(getContainer(oldMeta), getContainer(newMeta)); default: throw new IllegalArgumentException("Unhandled modification type " + mod.getModificationType()); } } @Override + @Nonnull public ModificationType getModificationType() { return Verify.verifyNotNull(mod.getModificationType(), "Node %s does not have resolved modification type", mod); } private static Optional> optionalData(final TreeNode meta) { - if (meta != null) { - return Optional.>of(meta.getData()); - } else { - return Optional.absent(); - } + return meta == null ? Optional.absent() : Optional.of(meta.getData()); } @Override + @Nonnull public final Optional> getDataAfter() { return optionalData(newMeta); } @Override + @Nonnull public final Optional> getDataBefore() { return optionalData(oldMeta); } @@ -139,6 +124,8 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida @Override public final DataTreeCandidateNode getModifiedChild(final PathArgument identifier) { switch (mod.getModificationType()) { + case APPEARED: + case DISAPPEARED: case SUBTREE_MODIFIED: final Optional childMod = mod.getChild(identifier); if (childMod.isPresent()) { @@ -146,23 +133,18 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida } return null; case UNMODIFIED: - if (canHaveChildren(oldMeta, newMeta)) { - final Optional> maybeChild = getContainer(newMeta != null ? newMeta : oldMeta).getChild(identifier); - if (maybeChild.isPresent()) { - return TO_UNMODIFIED_NODE.apply(maybeChild.get()); - } else { - return null; - } - } else { + if (!canHaveChildren(oldMeta, newMeta)) { return null; } + final Optional> maybeChild = getContainer(newMeta != null ? newMeta : oldMeta) + .getChild(identifier); + return maybeChild.isPresent() ? AbstractRecursiveCandidateNode.unmodifiedNode(maybeChild.get()) : null; case DELETE: case WRITE: - if (canHaveChildren(oldMeta, newMeta)) { - return AbstractDataTreeCandidateNode.deltaChild(getContainer(oldMeta), getContainer(newMeta), identifier); - } else { + if (!canHaveChildren(oldMeta, newMeta)) { return null; } + return AbstractDataTreeCandidateNode.deltaChild(getContainer(oldMeta), getContainer(newMeta), identifier); default: throw new IllegalArgumentException("Unhandled modification type " + mod.getModificationType()); } @@ -174,8 +156,15 @@ abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandida } @Override + @Nonnull public PathArgument getIdentifier() { return getMod().getIdentifier(); } } -} \ No newline at end of file + + @Override + public String toString() { + return this.getClass().getSimpleName() + "{mod = " + this.mod + ", oldMeta = " + this.oldMeta + ", newMeta = " + + this.newMeta + "}"; + } +}