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;
+import org.opendaylight.yangtools.yang.data.api.schema.builder.NormalizedNodeContainerBuilder;
import org.opendaylight.yangtools.yang.data.api.schema.tree.ConflictingModificationAppliedException;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
import org.opendaylight.yangtools.yang.data.api.schema.tree.ModifiedNodeDoesNotExistException;
import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.MutableTreeNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.data.spi.tree.MutableTreeNode;
+import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode;
+import org.opendaylight.yangtools.yang.data.spi.tree.TreeNodeFactory;
+import org.opendaylight.yangtools.yang.data.spi.tree.Version;
import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus;
abstract class AbstractNodeContainerModificationStrategy<T extends WithStatus>
@Override
final void verifyValueChildren(final NormalizedNode writtenValue) {
if (verifyChildrenStructure) {
- final DistinctNodeContainer<?, ?, ?> container = (DistinctNodeContainer<?, ?, ?>) writtenValue;
+ final DistinctNodeContainer<?, ?> container = (DistinctNodeContainer<?, ?>) writtenValue;
for (final NormalizedNode child : container.body()) {
final ModificationApplyOperation childOp = childByArg(child.getIdentifier());
if (childOp == null) {
@Override
protected final void recursivelyVerifyStructure(final NormalizedNode value) {
- final NormalizedNodeContainer<?, ?> container = (NormalizedNodeContainer<?, ?>) value;
+ final NormalizedNodeContainer<?> container = (NormalizedNodeContainer<?>) value;
for (final NormalizedNode child : container.body()) {
final ModificationApplyOperation childOp = childByArg(child.getIdentifier());
if (childOp == null) {
final NormalizedNode value = modification.getWrittenValue();
Verify.verify(value instanceof DistinctNodeContainer, "Attempted to merge non-container %s", value);
- for (final NormalizedNode c : ((DistinctNodeContainer<?, ?, ?>) value).body()) {
+ for (final NormalizedNode c : ((DistinctNodeContainer<?, ?>) value).body()) {
final PathArgument id = c.getIdentifier();
modification.modifyChild(id, resolveChildOperation(id), version);
}
@Override
final void mergeIntoModifiedNode(final ModifiedNode modification, final NormalizedNode value,
final Version version) {
- final Collection<? extends NormalizedNode> children = ((DistinctNodeContainer<?, ?, ?>)value).body();
+ final Collection<? extends NormalizedNode> children = ((DistinctNodeContainer<?, ?>)value).body();
switch (modification.getOperation()) {
case NONE:
// Fresh node, just record a MERGE with a value