From bf009ab944ceb87cbd348ee5b1e23eaefe2577da Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 18 Nov 2020 15:58:36 +0100 Subject: [PATCH] Unify ModificationApplyOperation.toString() Not all ModificationApplyOperation subclasses provide useful information in toString(). Make sure all of them do. JIRA: YANGTOOLS-1176 Change-Id: Id93f2899dcedd8c289b093c1e126c09108eefb4c Signed-off-by: Robert Varga (cherry picked from commit 53a726edb6deb453584d289b8d6dec12cb0d18c8) --- .../tree/AbstractNodeContainerModificationStrategy.java | 5 ----- .../data/impl/schema/tree/ListModificationStrategy.java | 6 ++++++ .../data/impl/schema/tree/MinMaxElementsValidation.java | 6 ++++++ .../impl/schema/tree/ModificationApplyOperation.java | 9 +++++++++ .../impl/schema/tree/ValueNodeModificationStrategy.java | 6 ++++++ 5 files changed, 27 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 2dc1edeca2..342745b735 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 @@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.data.impl.schema.tree; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; -import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Verify; import java.util.Collection; @@ -425,10 +424,6 @@ abstract class AbstractNodeContainerModificationStrategy } @Override - public final String toString() { - return addToStringAttributes(MoreObjects.toStringHelper(this)).toString(); - } - ToStringHelper addToStringAttributes(final ToStringHelper helper) { return helper.add("support", support).add("verifyChildren", verifyChildrenStructure); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListModificationStrategy.java index 4bfed11edd..84e2d7d490 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListModificationStrategy.java @@ -7,6 +7,7 @@ */ package org.opendaylight.yangtools.yang.data.impl.schema.tree; +import com.google.common.base.MoreObjects.ToStringHelper; import java.util.Optional; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -153,4 +154,9 @@ final class ListModificationStrategy extends SchemaAwareApplyOperation value) throws DataValidationFailedException { final PathArgument id = value.getIdentifier(); diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationApplyOperation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationApplyOperation.java index 60b83b1791..9b402a64d7 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationApplyOperation.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationApplyOperation.java @@ -7,6 +7,8 @@ */ package org.opendaylight.yangtools.yang.data.impl.schema.tree; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import java.util.Optional; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -118,4 +120,11 @@ abstract class ModificationApplyOperation implements StoreTreeNode getChild(PathArgument child); abstract void recursivelyVerifyStructure(NormalizedNode value); + + abstract ToStringHelper addToStringAttributes(ToStringHelper helper); + + @Override + public final String toString() { + return addToStringAttributes(MoreObjects.toStringHelper(this)).toString(); + } } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ValueNodeModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ValueNodeModificationStrategy.java index 9eb8af3e91..0251d535ba 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ValueNodeModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ValueNodeModificationStrategy.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema.tree; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import com.google.common.base.MoreObjects.ToStringHelper; import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -100,6 +101,11 @@ final class ValueNodeModificationStrategy value) { checkArgument(nodeClass.isInstance(value), "Expected an instance of %s, have %s", nodeClass, value); } -- 2.36.6