*/
package org.opendaylight.yangtools.yang.data.api.schema.tree.spi;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
+import static com.google.common.base.Verify.verify;
+import static java.util.Objects.requireNonNull;
+
import java.util.Map;
import org.opendaylight.yangtools.util.MapAdaptor;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
this.data = parent.getData();
this.version = parent.getVersion();
this.subtreeVersion = parent.getSubtreeVersion();
- this.children = Preconditions.checkNotNull(children);
+ this.children = requireNonNull(children);
}
protected final Version getVersion() {
@Override
public final void setSubtreeVersion(final Version subtreeVersion) {
- this.subtreeVersion = Preconditions.checkNotNull(subtreeVersion);
+ this.subtreeVersion = requireNonNull(subtreeVersion);
}
@Override
- public final void addChild(final TreeNode child) {
- children.put(child.getIdentifier(), child);
+ public final TreeNode putChild(final TreeNode child) {
+ return children.put(child.getIdentifier(), child);
}
@Override
- public final void removeChild(final PathArgument id) {
- children.remove(id);
+ public final TreeNode removeChild(final PathArgument id) {
+ return children.remove(requireNonNull(id));
}
@Override
public final void setData(final NormalizedNode<?, ?> data) {
- this.data = Preconditions.checkNotNull(data);
+ this.data = requireNonNull(data);
}
@Override
*/
if (!version.equals(subtreeVersion)) {
final Map<PathArgument, TreeNode> newChildren = MapAdaptor.getDefaultInstance().optimize(children);
- final int dataSize = getData().getValue().size();
- if (dataSize != newChildren.size()) {
- Verify.verify(dataSize > newChildren.size(), "Detected %s modified children, data has only %s",
- newChildren.size(), dataSize);
+ final int dataSize = getData().size();
+ final int childrenSize = newChildren.size();
+ if (dataSize != childrenSize) {
+ verify(dataSize > childrenSize, "Detected %s modified children, data has only %s",
+ childrenSize, dataSize);
ret = new LazyContainerNode(data, version, newChildren, subtreeVersion);
} else {
ret = new MaterializedContainerNode(data, version, newChildren, subtreeVersion);