Fix class hierarchy safe-logging error message agreement (#2295)

Fix class hierarchy safe-logging error message agreement
palantir · Jun 7, 2022 · 19efea8 · 19efea8
1 parent f70dfb6
commit 19efea8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/...rror-prone/src/main/java/com/palantir/baseline/errorprone/IllegalSafeLoggingArgument.java b/...rror-prone/src/main/java/com/palantir/baseline/errorprone/IllegalSafeLoggingArgument.java
@@ -354,8 +354,7 @@ public Description matchClass(ClassTree tree, VisitorState state) {
         }
         return buildDescription(tree)
                 .setMessage(String.format(
-                        "Dangerous type: annotated '%s' but ancestors declare '%s'.",
-                        directSafety, SafetyAnnotations.getSafety(tree, state)))
+                        "Dangerous type: annotated '%s' but ancestors declare '%s'.", directSafety, ancestorSafety))
                 .build();
     }
 }
diff --git a/...-prone/src/test/java/com/palantir/baseline/errorprone/IllegalSafeLoggingArgumentTest.java b/...-prone/src/test/java/com/palantir/baseline/errorprone/IllegalSafeLoggingArgumentTest.java
@@ -1768,7 +1768,8 @@ public void testSubclassWithLenientSafety() {
                         "import com.palantir.logsafe.*;",
                         "class Test {",
                         "  @Unsafe interface UnsafeClass {}",
-                        "  // BUG: Diagnostic contains: Dangerous type: annotated 'SAFE' but ancestors declare 'SAFE'.",
+                        "  // BUG: Diagnostic contains: "
+                                + "Dangerous type: annotated 'SAFE' but ancestors declare 'UNSAFE'.",
                         "  @Safe interface SafeSubclass extends UnsafeClass {}",
                         "}")
                 .doTest();

diff --git a/changelog/@unreleased/pr-2295.v2.yml b/changelog/@unreleased/pr-2295.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Fix class hierarchy safe-logging error message agreement
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/2295