From a44ecea920d25ff2ebe030ede7347a871f689462 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 25 May 2022 11:18:08 +0200 Subject: [PATCH] Add AbstractConstraint.toString() Resolved constraints do not have a nice toString() method, making debugging harder than it needs to be. Add a toString() method which exposes allowed ranges, which is usually what we need to know. Change-Id: Ib3a8caa67a765cb29db0b2b28509f07a4c1058ce Signed-off-by: Robert Varga --- .../yang/model/ri/type/AbstractConstraint.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractConstraint.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractConstraint.java index 78be773de8..355b4e1ce8 100644 --- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractConstraint.java +++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/type/AbstractConstraint.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.model.ri.type; import static com.google.common.base.Verify.verify; import static java.util.Objects.requireNonNull; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; @@ -30,11 +31,7 @@ abstract class AbstractConstraint> implements C this.meta = requireNonNull(meta); final var tmp = ranges.asRanges(); - if (tmp.size() == 1) { - this.ranges = tmp.iterator().next(); - } else { - this.ranges = ImmutableRangeSet.copyOf(ranges); - } + this.ranges = tmp.size() == 1 ? tmp.iterator().next() : ImmutableRangeSet.copyOf(ranges); } @Override @@ -57,6 +54,11 @@ abstract class AbstractConstraint> implements C return meta.getReference(); } + @Override + public final String toString() { + return MoreObjects.toStringHelper(this).add("ranges", ranges()).toString(); + } + @SuppressWarnings("unchecked") final @NonNull ImmutableRangeSet ranges() { if (ranges instanceof ImmutableRangeSet) { -- 2.36.6