Code cleanup

Author: bannmann

core/src/main/java/dev/bannmann/mandor/core/Nodes.java

@@ -36,7 +36,7 @@ public static <T> Optional<T> findAncestor(HasParentNode<Node> node, Class<T> an
         return node.findAncestor(predicate, ancestorClass);
     }
 
-    public String getEnclosingTypeName(Node startingNode)
+    public String obtainEnclosingTopLevelTypeName(Node startingNode)
     {
         String topmostTypeName = null;
         Node node = startingNode;

core/src/main/java/dev/bannmann/mandor/core/SourceRule.java

@@ -47,9 +47,8 @@ private void runTracked(AnnotationExpr annotationExpr, Runnable action)
 
             if (!suppression.wasHit())
             {
-                violations.add("%s needlessly suppresses %s in %s".formatted(Nodes.getEnclosingTypeName(annotationExpr),
-                    getClass().getSimpleName(),
-                    getContext().getCodeLocation(annotationExpr)));
+                violations.add("%s needlessly suppresses %s in %s".formatted(Nodes.obtainEnclosingTopLevelTypeName(
+                    annotationExpr), getClass().getSimpleName(), getContext().getCodeLocation(annotationExpr)));
             }
         }
     }

core/src/main/java/dev/bannmann/mandor/core/rules/AssertStatementUsage.java

@@ -23,7 +23,7 @@ public void visit(AssertStmt node, Void arg)
             super.visit(node, arg);
 
             addViolation("%s contains an assert statement in %s",
-                Nodes.getEnclosingTypeName(node),
+                Nodes.obtainEnclosingTopLevelTypeName(node),
                 getContext().getCodeLocation(node));
         }
 

core/src/main/java/dev/bannmann/mandor/core/rules/BitwiseOperatorUsage.java

@@ -55,7 +55,7 @@ private void process(Expression expression)
                     expression)));
 
             addViolation("%s uses bitwise operator in %s",
-                Nodes.getEnclosingTypeName(node),
+                Nodes.obtainEnclosingTopLevelTypeName(node),
                 getContext().getCodeLocation(node));
         }
 

core/src/main/java/dev/bannmann/mandor/core/rules/MalformedExhaustiveSwitch.java

@@ -47,7 +47,7 @@ private void process(AnnotationExpr annotation)
             if (!isUsedCorrectly(annotation))
             {
                 addViolation("%s uses @ExhaustiveSwitch incorrectly in %s",
-                    Nodes.getEnclosingTypeName(annotation),
+                    Nodes.obtainEnclosingTopLevelTypeName(annotation),
                     getContext().getCodeLocation(annotation));
             }
         }

core/src/main/java/dev/bannmann/mandor/core/rules/MissingSuppressionRationale.java

@@ -107,7 +107,7 @@ private void verifyRationalePresent(SingleMemberAnnotationExpr suppressionAnnota
                 : "warning";
 
             addViolation("%s suppresses %s %s without giving rationale in %s",
-                Nodes.getEnclosingTypeName(suppressionAnnotation),
+                Nodes.obtainEnclosingTopLevelTypeName(suppressionAnnotation),
                 what,
                 suppressedWithoutRationale.stream()
                     .sorted()

core/src/main/java/dev/bannmann/mandor/core/rules/NullabilityAnnotationOutsideNullMarkedCode.java

@@ -53,7 +53,7 @@ private void process(AnnotationExpr annotation)
             }
 
             addViolation("%s is not NullMarked but uses a jSpecify nullability annotation in %s",
-                Nodes.getEnclosingTypeName(annotation),
+                Nodes.obtainEnclosingTopLevelTypeName(annotation),
                 getContext().getCodeLocation(annotation));
         }
 

core/src/main/java/dev/bannmann/mandor/core/rules/OctalNumberUsage.java

@@ -33,7 +33,7 @@ private void process(LiteralStringValueExpr node)
             if (octalDetector.isOctal(node.getValue()))
             {
                 addViolation("%s contains an octal number literal in %s",
-                    Nodes.getEnclosingTypeName(node),
+                    Nodes.obtainEnclosingTopLevelTypeName(node),
                     getContext().getCodeLocation(node));
             }
         }

core/src/main/java/dev/bannmann/mandor/core/rules/OrphanedSuppressionRationale.java

@@ -62,7 +62,7 @@ private void validateSuppressionExists(AnnotationExpr annotation)
             if (suppressionAnnotationOptional.isEmpty())
             {
                 addViolation("%s gives a rationale without suppressing a warning in %s",
-                    Nodes.getEnclosingTypeName(annotation),
+                    Nodes.obtainEnclosingTopLevelTypeName(annotation),
                     getContext().getCodeLocation(annotation));
             }
         }

core/src/main/java/dev/bannmann/mandor/core/rules/OvercomplicatedSuppressionRationale.java

@@ -45,7 +45,7 @@ private void processAnnotation(NormalAnnotationExpr annotation)
                 if (shouldUseSingleMemberForm(annotation))
                 {
                     addViolation("%s needlessly uses the full `value=\"…\"` syntax for a rationale in %s",
-                        Nodes.getEnclosingTypeName(annotation),
+                        Nodes.obtainEnclosingTopLevelTypeName(annotation),
                         getContext().getCodeLocation(annotation));
                 }
             }
@@ -86,7 +86,7 @@ private void validateMultipleSuppressionsExist(NormalAnnotationExpr annotation)
                 .isEmpty())
             {
                 addViolation("%s needlessly specifies a suppression name for a rationale in %s",
-                    Nodes.getEnclosingTypeName(annotation),
+                    Nodes.obtainEnclosingTopLevelTypeName(annotation),
                     getContext().getCodeLocation(annotation));
             }
         }