Message format checks use instanceof rather than catching

baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/PreconditionsMessageFormat.java

@@ -52,12 +52,17 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
             return Description.NO_MATCH;
         }
 
-        String message;
-        try {
-            message = (String) ((LiteralTree) messageArg).getValue();
-        } catch (ClassCastException exception) {
+        if (!(messageArg instanceof LiteralTree)) {
             return Description.NO_MATCH;
         }
+        LiteralTree literalTreeMessageArg = (LiteralTree) messageArg;
+
+        Object value = literalTreeMessageArg.getValue();
+
+        if (!(value instanceof String)) {
+            return Description.NO_MATCH;
+        }
+        String message = (String) value;
 
         return matchMessageFormat(tree, message, state);
     }

baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/SafeLoggingExceptionMessageFormat.java

@@ -65,12 +65,17 @@ public Description matchNewClass(NewClassTree tree, VisitorState state) {
             return Description.NO_MATCH;
         }
 
-        String message;
-        try {
-            message = (String) ((LiteralTree) messageArg).getValue();
-        } catch (ClassCastException exception) {
+        if (!(messageArg instanceof LiteralTree)) {
             return Description.NO_MATCH;
         }
+        LiteralTree literalTreeMessageArg = (LiteralTree) messageArg;
+
+        Object value = literalTreeMessageArg.getValue();
+
+        if (!(value instanceof String)) {
+            return Description.NO_MATCH;
+        }
+        String message = (String) value;
 
         if (message.contains("{}")) {
             return buildDescription(tree)

changelog/@unreleased/pr-821.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Message format checks use instanceof rather than catching
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/821