refactor: Remove redundant null checks before instanceof

timtebeek · TeamModerne · timtebeek · commit 4e96d7bbb0c3 · 2025-07-09T08:45:28.000Z
Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.staticanalysis.RemoveRedundantNullCheckBeforeInstanceof?organizationId=ODQ2MGExMTUtNDg0My00N2EwLTgzMGMtNGE1NGExMTBmZDkw Co-authored-by: Moderne <team@moderne.io>
diff --git a/src/main/java/org/openrewrite/java/logging/SystemErrToLogging.java b/src/main/java/org/openrewrite/java/logging/SystemErrToLogging.java
@@ -103,7 +103,7 @@ private List<Statement> collapseNextThrowablePrintStackTrace(List<Statement> sta
                     } else if (stat instanceof J.MethodInvocation) {
                         J.MethodInvocation m = (J.MethodInvocation) stat;
                         if (systemErrPrint.matches((Expression) stat)) {
-                            if (m.getSelect() != null && m.getSelect() instanceof J.FieldAccess) {
+                            if (m.getSelect() instanceof J.FieldAccess) {
                                 JavaType.Variable field = ((J.FieldAccess) m.getSelect()).getName().getFieldType();
                                 if (field != null && "err".equals(field.getName()) && TypeUtils.isOfClassType(field.getOwner(), "java.lang.System")) {
                                     Expression exceptionPrintStackTrace = null;
@@ -132,7 +132,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
                 if (systemErrPrint.matches((Expression) method)) {
                     if (getCursor().getParentOrThrow().getValue() instanceof J.Lambda) {
-                        if (m.getSelect() != null && m.getSelect() instanceof J.FieldAccess) {
+                        if (m.getSelect() instanceof J.FieldAccess) {
                             JavaType.Variable field = ((J.FieldAccess) m.getSelect()).getName().getFieldType();
                             if (field != null && "err".equals(field.getName()) && TypeUtils.isOfClassType(field.getOwner(), "java.lang.System")) {
                                 Cursor printCursor = new Cursor(getCursor().getParent(), m);
diff --git a/src/main/java/org/openrewrite/java/logging/SystemOutToLogging.java b/src/main/java/org/openrewrite/java/logging/SystemOutToLogging.java
@@ -82,7 +82,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
                 Cursor cursor = updateCursor(m);
                 if (systemOutPrint.matches((Expression) method)) {
-                    if (m.getSelect() != null && m.getSelect() instanceof J.FieldAccess) {
+                    if (m.getSelect() instanceof J.FieldAccess) {
                         JavaType.Variable field = ((J.FieldAccess) m.getSelect()).getName().getFieldType();
                         if (field != null && "out".equals(field.getName()) && TypeUtils.isOfClassType(field.getOwner(), "java.lang.System")) {
                             return logInsteadOfPrint(cursor, ctx);
