Collapse constitutionals in SimplifyBooleanExpression (#421)

* form * shouldSimplifyEqualsOn * Update src/main/java/org/openrewrite/staticanalysis/SimplifyBooleanExpression.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Vincent Potucek <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
openrewrite · Dec 27, 2024 · 383358b · 383358b
1 parent 34d6589
commit 383358b
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/src/main/java/org/openrewrite/staticanalysis/SimplifyBooleanExpression.java b/src/main/java/org/openrewrite/staticanalysis/SimplifyBooleanExpression.java
@@ -64,16 +64,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
             // e.g. `X?.fun() == true` is not equivalent to `X?.fun()`
             @Override
             protected boolean shouldSimplifyEqualsOn(@Nullable J j) {
-                if (j == null) {
-                    return true;
-                }
-
-                if (j instanceof J.MethodInvocation) {
-                    J.MethodInvocation m = (J.MethodInvocation) j;
-                    return !m.getMarkers().findFirst(IsNullSafe.class).isPresent();
-                }
-
-                return true;
+                return !(j instanceof J.MethodInvocation) ||
+                        !j.getMarkers().findFirst(IsNullSafe.class).isPresent();
             }
         };
     }