import static java.util.Objects.requireNonNull;
-import java.util.Optional;
+import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.DistinctNodeContainer;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
+import org.opendaylight.yangtools.yang.data.spi.node.MandatoryLeafEnforcer;
import org.opendaylight.yangtools.yang.data.tree.api.DataTreeConfiguration;
import org.opendaylight.yangtools.yang.data.tree.impl.node.TreeNode;
import org.opendaylight.yangtools.yang.data.tree.impl.node.Version;
@Override
protected TreeNode applyMerge(final ModifiedNode modification, final TreeNode currentMeta,
final Version version) {
- final TreeNode ret = super.applyMerge(modification, currentMeta, version);
- enforcer.enforceOnTreeNode(ret);
- return ret;
+ return enforce(super.applyMerge(modification, currentMeta, version));
}
@Override
protected TreeNode applyWrite(final ModifiedNode modification, final NormalizedNode newValue,
- final Optional<? extends TreeNode> currentMeta, final Version version) {
- final TreeNode ret = super.applyWrite(modification, newValue, currentMeta, version);
- enforcer.enforceOnTreeNode(ret);
- return ret;
+ final TreeNode currentMeta, final Version version) {
+ return enforce(super.applyWrite(modification, newValue, currentMeta, version));
}
@Override
protected TreeNode applyTouch(final ModifiedNode modification, final TreeNode currentMeta,
final Version version) {
- final TreeNode ret = super.applyTouch(modification, currentMeta, version);
- enforcer.enforceOnTreeNode(ret);
- return ret;
+ return enforce(super.applyTouch(modification, currentMeta, version));
+ }
+
+ private @NonNull TreeNode enforce(final TreeNode treeNode) {
+ enforcer.enforceOnData(treeNode.data());
+ return treeNode;
}
}
Structural(final ContainerLike schema, final DataTreeConfiguration treeConfig) {
super(schema, treeConfig);
- emptyNode = ImmutableNodes.containerNode(schema.getQName());
+ emptyNode = BUILDER_FACTORY.newContainerBuilder()
+ .withNodeIdentifier(NodeIdentifier.create(schema.getQName()))
+ .build();
}
@Override
- Optional<? extends TreeNode> apply(final ModifiedNode modification,
- final Optional<? extends TreeNode> storeMeta, final Version version) {
- return AutomaticLifecycleMixin.apply(super::apply, this::applyWrite, emptyNode, modification, storeMeta,
+ TreeNode apply(final ModifiedNode modification, final TreeNode currentMeta, final Version version) {
+ return AutomaticLifecycleMixin.apply(super::apply, this::applyWrite, emptyNode, modification, currentMeta,
version);
}
}
private static final NormalizedNodeContainerSupport<NodeIdentifier, ContainerNode> SUPPORT =
- new NormalizedNodeContainerSupport<>(ContainerNode.class, ImmutableContainerNodeBuilder::create,
- ImmutableContainerNodeBuilder::create);
+ new NormalizedNodeContainerSupport<>(ContainerNode.class, BUILDER_FACTORY::newContainerBuilder,
+ BUILDER_FACTORY::newContainerBuilder);
ContainerModificationStrategy(final ContainerLike schemaNode, final DataTreeConfiguration treeConfig) {
super(SUPPORT, schemaNode, treeConfig);
static ContainerModificationStrategy of(final ContainerSchemaNode schema, final DataTreeConfiguration treeConfig) {
if (schema.isPresenceContainer()) {
- final var enforcer = MandatoryLeafEnforcer.forContainer(schema, treeConfig);
+ final var enforcer = enforcerFor(schema, treeConfig);
return enforcer != null ? new EnforcingMandatory(schema, treeConfig, enforcer)
: new ContainerModificationStrategy(schema, treeConfig);
}