From 5f5412cf21f3b2e3f2156e23b8813eeadb6ffc92 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 5 Feb 2021 11:08:25 +0100 Subject: [PATCH] Do not include path in anydata/anyxml toString() Trim down toString() of these statements so as not to include SchemaNode.getPath(). JIRA: YANGTOOLS-1071 Change-Id: I3539049a18b0e4312a00bb27e0f4497d3d828fd5 Signed-off-by: Robert Varga --- .../stmt/anydata/EmptyAnydataEffectiveStatement.java | 2 +- .../rfc7950/stmt/anyxml/EmptyAnyxmlEffectiveStatement.java | 2 +- .../yangtools/yang/stmt/YangParserSimpleTest.java | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/EmptyAnydataEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/EmptyAnydataEffectiveStatement.java index a2475f49ad..69a1af0725 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/EmptyAnydataEffectiveStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anydata/EmptyAnydataEffectiveStatement.java @@ -65,6 +65,6 @@ class EmptyAnydataEffectiveStatement extends Default @Override public final String toString() { - return MoreObjects.toStringHelper(this).add("qname", getQName()).add("path", getPath()).toString(); + return MoreObjects.toStringHelper(this).add("qname", getQName()).toString(); } } diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/EmptyAnyxmlEffectiveStatement.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/EmptyAnyxmlEffectiveStatement.java index a9d2334f00..123dbbdb5b 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/EmptyAnyxmlEffectiveStatement.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/anyxml/EmptyAnyxmlEffectiveStatement.java @@ -56,6 +56,6 @@ class EmptyAnyxmlEffectiveStatement extends Default @Override public final String toString() { - return MoreObjects.toStringHelper(this).add("qname", getQName()).add("path", getPath()).toString(); + return MoreObjects.toStringHelper(this).add("qname", getQName()).toString(); } } diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java index f042691e31..fa51fb3e73 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserSimpleTest.java @@ -57,8 +57,7 @@ public class YangParserSimpleTest { QName.create(testModule.getQNameModule(), "data")); assertNotNull("'anyxml data not found'", data); assertFalse(data.equals(null)); - assertEquals("RegularAnyxmlEffectiveStatement{qname=(urn:opendaylight:simple-nodes?revision=2013-07-30)data, " - + "path=AbsoluteSchemaPath{path=[(urn:opendaylight:simple-nodes?revision=2013-07-30)data]}}", + assertEquals("RegularAnyxmlEffectiveStatement{qname=(urn:opendaylight:simple-nodes?revision=2013-07-30)data}", data.toString()); // test SchemaNode args @@ -103,8 +102,7 @@ public class YangParserSimpleTest { QName.create(testModule.getQNameModule(), "data2")).orElse(null); assertNotNull("'anydata data not found'", anydata); - assertEquals("RegularAnydataEffectiveStatement{qname=(urn:opendaylight:simple-nodes?revision=2013-07-30)data2, " - + "path=AbsoluteSchemaPath{path=[(urn:opendaylight:simple-nodes?revision=2013-07-30)data2]}}", + assertEquals("RegularAnydataEffectiveStatement{qname=(urn:opendaylight:simple-nodes?revision=2013-07-30)data2}", anydata.toString()); // test SchemaNode args -- 2.36.6