From 360963842964afa8f27ff04bdaba32cdc47c0e77 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 24 Mar 2015 11:32:54 +0100 Subject: [PATCH] Rename checkSubtreeModificationApplicable() This name comes from the ModificationType enum, which is no longer applicable internally. Shorted the name to checkTouchApplicable(). Change-Id: I5e1b844330a7b4a798b6a96403fa07de44813e96 Signed-off-by: Robert Varga --- .../tree/AbstractNodeContainerModificationStrategy.java | 2 +- .../schema/tree/AbstractValueNodeModificationStrategy.java | 2 +- .../yang/data/impl/schema/tree/SchemaAwareApplyOperation.java | 4 ++-- .../impl/schema/tree/UnkeyedListModificationStrategy.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java index 2908f0be83..9349ed5046 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java @@ -168,7 +168,7 @@ abstract class AbstractNodeContainerModificationStrategy extends SchemaAwareAppl } @Override - protected void checkSubtreeModificationApplicable(final YangInstanceIdentifier path, final NodeModification modification, + protected void checkTouchApplicable(final YangInstanceIdentifier path, final NodeModification modification, final Optional current) throws DataValidationFailedException { if (!modification.getOriginal().isPresent() && !current.isPresent()) { throw new ModifiedNodeDoesNotExistException(path, String.format("Node %s does not exist. Cannot apply modification to its children.", path)); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractValueNodeModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractValueNodeModificationStrategy.java index a8f4426259..e2d5cdec1a 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractValueNodeModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractValueNodeModificationStrategy.java @@ -67,7 +67,7 @@ abstract class AbstractValueNodeModificationStrategy e } @Override - protected final void checkSubtreeModificationApplicable(final YangInstanceIdentifier path, final NodeModification modification, + protected final void checkTouchApplicable(final YangInstanceIdentifier path, final NodeModification modification, final Optional current) throws IncorrectDataStructureException { throw new IncorrectDataStructureException(path, "Subtree modification is not allowed."); } 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 e87cc48405..b691f9f20a 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 @@ -118,7 +118,7 @@ abstract class SchemaAwareApplyOperation extends ModificationApplyOperation { checkDeleteApplicable(modification, current); break; case TOUCH: - checkSubtreeModificationApplicable(path, modification, current); + checkTouchApplicable(path, modification, current); break; case WRITE: checkWriteApplicable(path, modification, current); @@ -252,7 +252,7 @@ abstract class SchemaAwareApplyOperation extends 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); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java index 82f4e9814d..8231dac245 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/UnkeyedListModificationStrategy.java @@ -127,7 +127,7 @@ final class UnkeyedListModificationStrategy extends SchemaAwareApplyOperation { } @Override - protected void checkSubtreeModificationApplicable(final YangInstanceIdentifier path, final NodeModification modification, + protected void checkTouchApplicable(final YangInstanceIdentifier path, final NodeModification modification, final Optional current) throws IncorrectDataStructureException { throw new IncorrectDataStructureException(path, "Subtree modification is not allowed."); } -- 2.36.6