Use method references in lambdas

src/main/java/org/openrewrite/staticanalysis/ChainStringBuilderAppendCalls.java

@@ -68,7 +68,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                         return m;
                     }
 
-                    if (flattenExpressions.stream().allMatch(exp -> exp instanceof J.Literal)) {
+                    if (flattenExpressions.stream().allMatch(J.Literal.class::isInstance)) {
                         return m;
                     }
 

src/main/java/org/openrewrite/staticanalysis/FinalizePrivateFields.java

@@ -90,7 +90,7 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
                 boolean canAllVariablesBeFinalized = mv.getVariables()
                     .stream()
                     .map(J.VariableDeclarations.NamedVariable::getVariableType)
-                    .allMatch(v -> privateFieldsToBeFinalized.contains(v));
+                    .allMatch(privateFieldsToBeFinalized::contains);
 
                 if (canAllVariablesBeFinalized) {
                     mv = autoFormat(mv.withVariables(ListUtils.map(mv.getVariables(), v -> {
@@ -119,7 +119,7 @@ private static List<J.VariableDeclarations.NamedVariable> collectPrivateFields(J
         return classDecl.getBody()
             .getStatements()
             .stream()
-            .filter(statement -> statement instanceof J.VariableDeclarations)
+            .filter(J.VariableDeclarations.class::isInstance)
             .map(J.VariableDeclarations.class::cast)
             .filter(mv -> mv.hasModifier(J.Modifier.Type.Private)
                           && !mv.hasModifier(J.Modifier.Type.Final)
@@ -134,7 +134,7 @@ private static int getConstructorCount(J.ClassDeclaration classDecl) {
         return (int) classDecl.getBody()
             .getStatements()
             .stream()
-            .filter(statement -> statement instanceof J.MethodDeclaration)
+            .filter(J.MethodDeclaration.class::isInstance)
             .map(J.MethodDeclaration.class::cast)
             .filter(J.MethodDeclaration::isConstructor)
             .count();
@@ -275,25 +275,25 @@ private static boolean dropUntilMeetCondition(Cursor cursor,
         private static boolean isInForLoop(Cursor cursor) {
             return dropUntilMeetCondition(cursor,
                 CollectPrivateFieldsAssignmentCounts::dropCursorEndCondition,
-                parent -> parent instanceof J.ForLoop);
+                J.ForLoop.class::isInstance);
         }
 
         private static boolean isInDoWhileLoopLoop(Cursor cursor) {
             return dropUntilMeetCondition(cursor,
                 CollectPrivateFieldsAssignmentCounts::dropCursorEndCondition,
-                parent -> parent instanceof J.DoWhileLoop);
+                J.DoWhileLoop.class::isInstance);
         }
 
         private static boolean isInWhileLoop(Cursor cursor) {
             return dropUntilMeetCondition(cursor,
                 CollectPrivateFieldsAssignmentCounts::dropCursorEndCondition,
-                parent -> parent instanceof J.WhileLoop);
+                J.WhileLoop.class::isInstance);
         }
 
         private static boolean isInLambda(Cursor cursor) {
             return dropUntilMeetCondition(cursor,
                 CollectPrivateFieldsAssignmentCounts::dropCursorEndCondition,
-                parent -> parent instanceof J.Lambda);
+                J.Lambda.class::isInstance);
         }
     }
 

src/main/java/org/openrewrite/staticanalysis/HiddenFieldVisitor.java

@@ -152,8 +152,8 @@ public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations
                 doAfterVisit(new RenameVariable<>(v, nextName));
                 if (parentScope.getValue() instanceof J.MethodDeclaration) {
                     Optional<J.VariableDeclarations> variableParameter = ((J.MethodDeclaration) parentScope.getValue()).getParameters().stream()
-                            .filter(it -> it instanceof J.VariableDeclarations)
-                            .map(it -> (J.VariableDeclarations) it)
+                            .filter(J.VariableDeclarations.class::isInstance)
+                            .map(J.VariableDeclarations.class::cast)
                             .filter(it -> it.getVariables().contains(v))
                             .findFirst();
                     if (variableParameter.isPresent()) {

src/main/java/org/openrewrite/staticanalysis/NoDoubleBraceInitialization.java

@@ -97,7 +97,7 @@ public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext executionC
                 List<Statement> initStatements = secondBlock.getStatements();
 
                 boolean maybeMistakenlyMissedAddingElement = !initStatements.isEmpty()
-                                                             && initStatements.stream().allMatch(statement -> statement instanceof J.NewClass);
+                                                             && initStatements.stream().allMatch(J.NewClass.class::isInstance);
 
                 if (maybeMistakenlyMissedAddingElement) {
                     JavaType newClassType = nc.getType();
@@ -115,7 +115,7 @@ public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext executionC
                     if (parentBlockCursor.getParent().getValue() instanceof J.ClassDeclaration) {
                         JavaType.FullyQualified fq = TypeUtils.asFullyQualified(nc.getType());
                         if (fq != null && fq.getSupertype() != null) {
-                            Cursor varDeclsCursor = getCursor().dropParentUntil(parent -> parent instanceof J.VariableDeclarations);
+                            Cursor varDeclsCursor = getCursor().dropParentUntil(J.VariableDeclarations.class::isInstance);
                             Cursor namedVarCursor = getCursor().dropParentUntil(J.VariableDeclarations.NamedVariable.class::isInstance);
                             namedVarCursor.putMessage("DROP_INITIALIZER", Boolean.TRUE);
 
@@ -129,7 +129,7 @@ public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext executionC
                         }
                     } else if (parentBlockCursor.getParent().getValue() instanceof J.MethodDeclaration) {
                         initStatements = addSelectToInitStatements(initStatements, var.getName(), executionContext);
-                        Cursor varDeclsCursor = getCursor().dropParentUntil(parent -> parent instanceof J.VariableDeclarations);
+                        Cursor varDeclsCursor = getCursor().dropParentUntil(J.VariableDeclarations.class::isInstance);
                         parentBlockCursor.computeMessageIfAbsent("METHOD_DECL_STATEMENTS", v -> new HashMap<Statement, List<Statement>>()).put(varDeclsCursor.getValue(), initStatements);
                         nc = nc.withBody(null);
                     }

src/main/java/org/openrewrite/staticanalysis/RemoveEmptyJavaDocParameters.java

@@ -56,7 +56,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
             @Override
             public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
                 J.MethodDeclaration md = super.visitMethodDeclaration(method, ctx);
-                if (md.getComments().stream().anyMatch(it -> it instanceof Javadoc.DocComment)) {
+                if (md.getComments().stream().anyMatch(Javadoc.DocComment.class::isInstance)) {
                     md = md.withComments(ListUtils.map(md.getComments(), it -> {
                         if (it instanceof Javadoc.DocComment) {
                             Javadoc.DocComment docComment = (Javadoc.DocComment) it;
@@ -161,11 +161,11 @@ public Javadoc visitDocComment(Javadoc.DocComment javadoc, ExecutionContext ctx)
                 }
 
                 public boolean isEmptyParameter(Javadoc.Parameter parameter) {
-                    return parameter.getDescription().stream().allMatch(it -> it instanceof Javadoc.LineBreak);
+                    return parameter.getDescription().stream().allMatch(Javadoc.LineBreak.class::isInstance);
                 }
 
                 public boolean isEmptyReturn(Javadoc.Return aReturn) {
-                    return aReturn.getDescription().stream().allMatch(it -> it instanceof Javadoc.LineBreak);
+                    return aReturn.getDescription().stream().allMatch(Javadoc.LineBreak.class::isInstance);
                 }
 
                 public boolean isEmptyErroneous(Javadoc.Erroneous erroneous) {

src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java

@@ -82,7 +82,7 @@ public J.Block visitBlock(final J.Block block, final ExecutionContext executionC
 
             @Override
             public J.Try.Resource visitTryResource(J.Try.Resource tr, ExecutionContext executionContext) {
-                J.Try _try = getCursor().dropParentUntil(is -> is instanceof J.Try).getValue();
+                J.Try _try = getCursor().dropParentUntil(J.Try.class::isInstance).getValue();
                 if (_try.getResources().isEmpty() ||
                         _try.getResources().get(_try.getResources().size() - 1) != tr ||
                         !_try.getResources().get(_try.getResources().size() - 1).isTerminatedWithSemicolon()) {

src/main/java/org/openrewrite/staticanalysis/RemoveUnneededBlock.java

@@ -81,7 +81,7 @@ private J.Block maybeInlineBlock(J.Block block, ExecutionContext ctx) {
                 }
 
                 // blocks are relevant for scoping, so don't flatten them if they contain variable declarations
-                if (i < statements.size() - 1 && nested.getStatements().stream().anyMatch(s -> s instanceof J.VariableDeclarations)) {
+                if (i < statements.size() - 1 && nested.getStatements().stream().anyMatch(J.VariableDeclarations.class::isInstance)) {
                     return stmt;
                 }
 

src/main/java/org/openrewrite/staticanalysis/RemoveUnusedLocalVariables.java

@@ -159,7 +159,7 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
                 J.VariableDeclarations mv = super.visitVariableDeclarations(multiVariable, ctx);
                 if (mv.getVariables().isEmpty()) {
                     if (!mv.getPrefix().getComments().isEmpty()) {
-                        getCursor().dropParentUntil(is -> is instanceof J.ClassDeclaration).putMessage("COMMENTS_KEY", mv.getPrefix().getComments());
+                        getCursor().dropParentUntil(J.ClassDeclaration.class::isInstance).putMessage("COMMENTS_KEY", mv.getPrefix().getComments());
                     }
                     doAfterVisit(new DeleteStatement<>(mv));
                 }

src/main/java/org/openrewrite/staticanalysis/ReplaceDuplicateStringLiterals.java

@@ -115,8 +115,8 @@ public J visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ct
                         String insertStatement = "private static final String " + variableName + " = #{any(String)};";
                         if (classDecl.getKind() == J.ClassDeclaration.Kind.Type.Enum) {
                             J.EnumValueSet enumValueSet = classDecl.getBody().getStatements().stream()
-                                    .filter(it -> it instanceof J.EnumValueSet)
-                                    .map(it -> (J.EnumValueSet) it)
+                                    .filter(J.EnumValueSet.class::isInstance)
+                                    .map(J.EnumValueSet.class::cast)
                                     .findFirst()
                                     .orElse(null);
 

src/main/java/org/openrewrite/staticanalysis/ReplaceOptionalIsPresentWithIfPresent.java

@@ -213,7 +213,7 @@ private static List<J.Identifier> collectFields(J.ClassDeclaration classDecl) {
             return classDecl.getBody()
                     .getStatements()
                     .stream()
-                    .filter(statement -> statement instanceof J.VariableDeclarations)
+                    .filter(J.VariableDeclarations.class::isInstance)
                     .map(J.VariableDeclarations.class::cast)
                     .map(J.VariableDeclarations::getVariables)
                     .flatMap(Collection::stream)

src/main/java/org/openrewrite/staticanalysis/UseLambdaForFunctionalInterface.java

@@ -277,15 +277,15 @@ public J visitIdentifier(J.Identifier ident, Integer integer) {
 
     private static List<String> parameterNames(J.MethodDeclaration method) {
         return method.getParameters().stream()
-                .filter(s -> s instanceof J.VariableDeclarations)
+                .filter(J.VariableDeclarations.class::isInstance)
                 .map(v -> ((J.VariableDeclarations) v).getVariables().get(0).getSimpleName())
                 .collect(Collectors.toList());
     }
 
     // This does not recursive descend extended classes for inherited fields.
     private static List<String> classFields(J.ClassDeclaration classDeclaration) {
         return classDeclaration.getBody().getStatements().stream()
-                .filter(s -> s instanceof J.VariableDeclarations)
+                .filter(J.VariableDeclarations.class::isInstance)
                 .map(v -> ((J.VariableDeclarations) v).getVariables().get(0).getSimpleName())
                 .collect(Collectors.toList());
     }