From 2bd2251ab6dd5cc3a96daf4d7de733955b6dc004 Mon Sep 17 00:00:00 2001 From: Lord of Abyss <103809695+Abyss-lord@users.noreply.github.com> Date: Mon, 20 Jan 2025 11:59:31 +0800 Subject: [PATCH] [#6235] fix(authz): fix PathBasedMetadataObject toString method (#6252) ### What changes were proposed in this pull request? fix `PathBasedMetadataObject#toString` method. ### Why are the changes needed? Fix: #6235 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? local ut test. --------- Co-authored-by: yangyang zhong <35210666+hdygxsj@users.noreply.github.com> Co-authored-by: Xiaojian Sun Co-authored-by: roryqi Co-authored-by: TengYao Chi Co-authored-by: Qi Yu Co-authored-by: Chun-Hao Liu --- .../common/PathBasedMetadataObject.java | 11 +++++--- .../common/TestPathBasedMetadataObject.java | 27 +++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/authorizations/authorization-common/src/main/java/org/apache/gravitino/authorization/common/PathBasedMetadataObject.java b/authorizations/authorization-common/src/main/java/org/apache/gravitino/authorization/common/PathBasedMetadataObject.java index 9720b813fa5..a1963f64539 100644 --- a/authorizations/authorization-common/src/main/java/org/apache/gravitino/authorization/common/PathBasedMetadataObject.java +++ b/authorizations/authorization-common/src/main/java/org/apache/gravitino/authorization/common/PathBasedMetadataObject.java @@ -122,8 +122,13 @@ public int hashCode() { @Override public String toString() { - return "MetadataObject: [fullName=" + fullName() + "], [path=" + path == null - ? "null" - : path + "], [type=" + type + "]"; + String strPath = path == null ? "null" : path; + return "MetadataObject: [fullName=" + + fullName() + + "], [path=" + + strPath + + "], [type=" + + type + + "]"; } } diff --git a/authorizations/authorization-common/src/test/java/org/apache/gravitino/authorization/common/TestPathBasedMetadataObject.java b/authorizations/authorization-common/src/test/java/org/apache/gravitino/authorization/common/TestPathBasedMetadataObject.java index 3f604b5f389..d2a2291a356 100644 --- a/authorizations/authorization-common/src/test/java/org/apache/gravitino/authorization/common/TestPathBasedMetadataObject.java +++ b/authorizations/authorization-common/src/test/java/org/apache/gravitino/authorization/common/TestPathBasedMetadataObject.java @@ -47,4 +47,31 @@ public void PathBasedMetadataObjectNotEquals() { Assertions.assertNotEquals(pathBasedMetadataObject1, pathBasedMetadataObject2); } + + @Test + void testToString() { + PathBasedMetadataObject pathBasedMetadataObject1 = + new PathBasedMetadataObject("parent", "name", "path", PathBasedMetadataObject.Type.PATH); + Assertions.assertEquals( + "MetadataObject: [fullName=parent.name], [path=path], [type=PATH]", + pathBasedMetadataObject1.toString()); + + PathBasedMetadataObject pathBasedMetadataObject2 = + new PathBasedMetadataObject("parent", "name", null, PathBasedMetadataObject.Type.PATH); + Assertions.assertEquals( + "MetadataObject: [fullName=parent.name], [path=null], [type=PATH]", + pathBasedMetadataObject2.toString()); + + PathBasedMetadataObject pathBasedMetadataObject3 = + new PathBasedMetadataObject(null, "name", null, PathBasedMetadataObject.Type.PATH); + Assertions.assertEquals( + "MetadataObject: [fullName=name], [path=null], [type=PATH]", + pathBasedMetadataObject3.toString()); + + PathBasedMetadataObject pathBasedMetadataObject4 = + new PathBasedMetadataObject(null, "name", "path", PathBasedMetadataObject.Type.PATH); + Assertions.assertEquals( + "MetadataObject: [fullName=name], [path=path], [type=PATH]", + pathBasedMetadataObject4.toString()); + } }