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%2FSchemaAwareApplyOperation.java;h=b771bccadf616380fe98279648c54161d9a93bcb;hb=bfc874afaebe67ae06c485791a5cfbc098e1f09b;hp=aaee9c30d8fb96c27c9ca216d87a09da2861fe16;hpb=a10f89d551d5592577b8b573d571a9b0cf3f3ae2;p=yangtools.git diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java index aaee9c30d8..b771bccadf 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java @@ -18,6 +18,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.ConflictingModificationAppliedException; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; import org.opendaylight.yangtools.yang.data.api.schema.tree.IncorrectDataStructureException; +import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; @@ -32,41 +33,34 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -abstract class SchemaAwareApplyOperation implements ModificationApplyOperation { +abstract class SchemaAwareApplyOperation extends ModificationApplyOperation { private static final Logger LOG = LoggerFactory.getLogger(SchemaAwareApplyOperation.class); public static SchemaAwareApplyOperation from(final DataSchemaNode schemaNode) { if (schemaNode instanceof ContainerSchemaNode) { - return new DataNodeContainerModificationStrategy.ContainerModificationStrategy((ContainerSchemaNode) schemaNode); + return new ContainerModificationStrategy((ContainerSchemaNode) schemaNode); } else if (schemaNode instanceof ListSchemaNode) { return fromListSchemaNode((ListSchemaNode) schemaNode); } else if (schemaNode instanceof ChoiceSchemaNode) { - return new NormalizedNodeContainerModificationStrategy.ChoiceModificationStrategy((ChoiceSchemaNode) schemaNode); + return new ChoiceModificationStrategy((ChoiceSchemaNode) schemaNode); } else if (schemaNode instanceof LeafListSchemaNode) { return fromLeafListSchemaNode((LeafListSchemaNode) schemaNode); } else if (schemaNode instanceof LeafSchemaNode) { - return new ValueNodeModificationStrategy.LeafModificationStrategy((LeafSchemaNode) schemaNode); + return new LeafModificationStrategy((LeafSchemaNode) schemaNode); } throw new IllegalArgumentException("Not supported schema node type for " + schemaNode.getClass()); } public static SchemaAwareApplyOperation from(final DataNodeContainer resolvedTree, final AugmentationTarget augSchemas, final AugmentationIdentifier identifier) { - AugmentationSchema augSchema = null; - - allAugments: - for (AugmentationSchema potential : augSchemas.getAvailableAugmentations()) { - for (DataSchemaNode child : potential.getChildNodes()) { - if (identifier.getPossibleChildNames().contains(child.getQName())) { - augSchema = potential; - break allAugments; - } + for (final AugmentationSchema potential : augSchemas.getAvailableAugmentations()) { + for (final DataSchemaNode child : potential.getChildNodes()) { + if (identifier.getPossibleChildNames().contains(child.getQName())) { + return new AugmentationModificationStrategy(potential, resolvedTree); } } - - if (augSchema != null) { - return new DataNodeContainerModificationStrategy.AugmentationModificationStrategy(augSchema, resolvedTree); } + return null; } @@ -78,26 +72,29 @@ abstract class SchemaAwareApplyOperation implements ModificationApplyOperation { } private static SchemaAwareApplyOperation fromListSchemaNode(final ListSchemaNode schemaNode) { - List keyDefinition = schemaNode.getKeyDefinition(); + final List keyDefinition = schemaNode.getKeyDefinition(); + final SchemaAwareApplyOperation op; if (keyDefinition == null || keyDefinition.isEmpty()) { - return new UnkeyedListModificationStrategy(schemaNode); - } - if (schemaNode.isUserOrdered()) { - return new NormalizedNodeContainerModificationStrategy.OrderedMapModificationStrategy(schemaNode); + op = new UnkeyedListModificationStrategy(schemaNode); + } else if (schemaNode.isUserOrdered()) { + op = new OrderedMapModificationStrategy(schemaNode); + } else { + op = new UnorderedMapModificationStrategy(schemaNode); } - - return new NormalizedNodeContainerModificationStrategy.UnorderedMapModificationStrategy(schemaNode); + return MinMaxElementsValidation.from(op, schemaNode); } private static SchemaAwareApplyOperation fromLeafListSchemaNode(final LeafListSchemaNode schemaNode) { + final SchemaAwareApplyOperation op; if(schemaNode.isUserOrdered()) { - return new NormalizedNodeContainerModificationStrategy.OrderedLeafSetModificationStrategy(schemaNode); + op = new OrderedLeafSetModificationStrategy(schemaNode); } else { - return new NormalizedNodeContainerModificationStrategy.UnorderedLeafSetModificationStrategy(schemaNode); + op = new UnorderedLeafSetModificationStrategy(schemaNode); } + return MinMaxElementsValidation.from(op, schemaNode); } - private static final void checkNotConflicting(final YangInstanceIdentifier path, final TreeNode original, final TreeNode current) throws ConflictingModificationAppliedException { + protected static final void checkNotConflicting(final YangInstanceIdentifier path, final TreeNode original, final TreeNode current) throws ConflictingModificationAppliedException { checkConflicting(path, original.getVersion().equals(current.getVersion()), "Node was replaced by other transaction."); checkConflicting(path, original.getSubtreeVersion().equals(current.getSubtreeVersion()), @@ -105,42 +102,42 @@ abstract class SchemaAwareApplyOperation implements ModificationApplyOperation { } protected final ModificationApplyOperation resolveChildOperation(final PathArgument child) { - Optional potential = getChild(child); + final Optional potential = getChild(child); Preconditions.checkArgument(potential.isPresent(), "Operation for child %s is not defined.", child); return potential.get(); } @Override - public void verifyStructure(final ModifiedNode modification) throws IllegalArgumentException { + void verifyStructure(final ModifiedNode modification) throws IllegalArgumentException { if (modification.getOperation() == LogicalOperation.WRITE) { verifyWrittenStructure(modification.getWrittenValue()); } } @Override - public final void checkApplicable(final YangInstanceIdentifier path,final NodeModification modification, final Optional current) throws DataValidationFailedException { + final void checkApplicable(final YangInstanceIdentifier path,final NodeModification modification, final Optional current) throws DataValidationFailedException { switch (modification.getOperation()) { case DELETE: checkDeleteApplicable(modification, current); + break; case TOUCH: - checkSubtreeModificationApplicable(path, modification, current); - return; + checkTouchApplicable(path, modification, current); + break; case WRITE: checkWriteApplicable(path, modification, current); - return; + break; case MERGE: checkMergeApplicable(path, modification, current); - return; + break; case NONE: - return; + break; default: - throw new UnsupportedOperationException("Suplied modification type "+ modification.getOperation()+ "is not supported."); + throw new UnsupportedOperationException("Suplied modification type "+ modification.getOperation()+ " is not supported."); } - } protected void checkMergeApplicable(final YangInstanceIdentifier path, final NodeModification modification, final Optional current) throws DataValidationFailedException { - Optional original = modification.getOriginal(); + final Optional original = modification.getOriginal(); if (original.isPresent() && current.isPresent()) { /* * We need to do conflict detection only and only if the value of leaf changed @@ -166,7 +163,7 @@ abstract class SchemaAwareApplyOperation implements ModificationApplyOperation { */ protected void checkWriteApplicable(final YangInstanceIdentifier path, final NodeModification modification, final Optional current) throws DataValidationFailedException { - Optional original = modification.getOriginal(); + final Optional original = modification.getOriginal(); if (original.isPresent() && current.isPresent()) { checkNotConflicting(path, original.get(), current.get()); } else if(original.isPresent()) { @@ -176,28 +173,28 @@ abstract class SchemaAwareApplyOperation implements ModificationApplyOperation { } } - private void checkDeleteApplicable(final NodeModification modification, final Optional current) { + private static void checkDeleteApplicable(final NodeModification modification, final Optional current) { // Delete is always applicable, we do not expose it to subclasses if (current.isPresent()) { LOG.trace("Delete operation turned to no-op on missing node {}", modification); } } - boolean isOrdered() { - return false; + @Override + protected ChildTrackingPolicy getChildPolicy() { + return ChildTrackingPolicy.UNORDERED; } @Override - public final Optional apply(final ModifiedNode modification, - final Optional currentMeta, final Version version) { - + final Optional apply(final ModifiedNode modification, final Optional currentMeta, final Version version) { switch (modification.getOperation()) { case DELETE: + modification.resolveModificationType(ModificationType.DELETE); return modification.setSnapshot(Optional. absent()); case TOUCH: - Preconditions.checkArgument(currentMeta.isPresent(), "Metadata not available for modification", + Preconditions.checkArgument(currentMeta.isPresent(), "Metadata not available for modification %s", modification); - return modification.setSnapshot(Optional.of(applySubtreeChange(modification, currentMeta.get(), + return modification.setSnapshot(Optional.of(applyTouch(modification, currentMeta.get(), version))); case MERGE: final TreeNode result; @@ -206,27 +203,47 @@ abstract class SchemaAwareApplyOperation implements ModificationApplyOperation { if (currentMeta.isPresent()) { result = applyMerge(modification,currentMeta.get(), version); } else { + modification.resolveModificationType(ModificationType.WRITE); result = applyWrite(modification, currentMeta, version); } return modification.setSnapshot(Optional.of(result)); case WRITE: + modification.resolveModificationType(ModificationType.WRITE); return modification.setSnapshot(Optional.of(applyWrite(modification, currentMeta, version))); case NONE: + modification.resolveModificationType(ModificationType.UNMODIFIED); return currentMeta; default: throw new IllegalArgumentException("Provided modification type is not supported."); } } - protected abstract TreeNode applyMerge(ModifiedNode modification, - TreeNode currentMeta, Version version); + /** + * Apply a merge operation. Since the result of merge differs based on the data type + * being modified, implementations of this method are responsible for calling + * {@link ModifiedNode#resolveModificationType(ModificationType)} as appropriate. + * + * @param modification Modified node + * @param currentMeta Store Metadata Node on which NodeModification should be applied + * @param version New subtree version of parent node + * @return A sealed TreeNode representing applied operation. + */ + protected abstract TreeNode applyMerge(ModifiedNode modification, TreeNode currentMeta, Version version); - protected abstract TreeNode applyWrite(ModifiedNode modification, - Optional currentMeta, Version version); + protected abstract TreeNode applyWrite(ModifiedNode modification, Optional currentMeta, Version version); - protected abstract TreeNode applySubtreeChange(ModifiedNode modification, - TreeNode currentMeta, Version version); + /** + * Apply a nested operation. Since there may not actually be a nested operation + * to be applied, implementations of this method are responsible for calling + * {@link ModifiedNode#resolveModificationType(ModificationType)} as appropriate. + * + * @param modification Modified node + * @param currentMeta Store Metadata Node on which NodeModification should be applied + * @param version New subtree version of parent node + * @return A sealed TreeNode representing applied operation. + */ + protected abstract TreeNode applyTouch(ModifiedNode modification, TreeNode currentMeta, Version version); /** * @@ -238,7 +255,7 @@ abstract class SchemaAwareApplyOperation implements ModificationApplyOperation { * @throws ConflictingModificationAppliedException If subtree was changed in conflicting way * @throws IncorrectDataStructureException If subtree modification is not applicable (e.g. leaf node). */ - protected abstract void checkSubtreeModificationApplicable(YangInstanceIdentifier path, final NodeModification modification, + protected abstract void checkTouchApplicable(YangInstanceIdentifier path, final NodeModification modification, final Optional current) throws DataValidationFailedException; protected abstract void verifyWrittenStructure(NormalizedNode writtenValue);