Minor touch-ups

Author: knutwannheden

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

@@ -59,8 +59,8 @@ public Expression visitExpression(Expression expression, ExecutionContext ctx) {
                 Expression e = (Expression) super.visitExpression(expression, ctx);
                 if (TypeUtils.isOfClassType(e.getType(), "java.lang.Boolean")) {
                     if (isControlExpression(expression)) {
-                        return JavaTemplate.builder("Boolean.TRUE.equals(#{any(java.lang.Boolean)})").build()
-                                .apply(updateCursor(e), e.getCoordinates().replace(), e);
+                        return JavaTemplate.apply("Boolean.TRUE.equals(#{any(java.lang.Boolean)})",
+                                updateCursor(e), e.getCoordinates().replace(), e);
                     }
                 }
                 return e;
@@ -70,8 +70,8 @@ public Expression visitExpression(Expression expression, ExecutionContext ctx) {
             public J visitUnary(J.Unary unary, ExecutionContext executionContext) {
                 J.Unary un = (J.Unary) super.visitUnary(unary, executionContext);
                 if (J.Unary.Type.Not == un.getOperator() && TypeUtils.isOfClassType(un.getExpression().getType(), "java.lang.Boolean")) {
-                    return JavaTemplate.builder("Boolean.FALSE.equals(#{any(java.lang.Boolean)})").build()
-                            .apply(updateCursor(un), un.getCoordinates().replace(), un.getExpression());
+                    return JavaTemplate.apply("Boolean.FALSE.equals(#{any(java.lang.Boolean)})",
+                            updateCursor(un), un.getCoordinates().replace(), un.getExpression());
                 }
                 return un;
             }

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

@@ -44,7 +44,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 J.MethodInvocation mi = super.visitMethodInvocation(method, executionContext);
                 if (removeAll.matches(mi) && !returnValueIsUsed()) {
                     mi = JavaTemplate.builder("#{any(java.util.Collection)}.forEach(#{any(java.util.Set)}::remove)")
-                            .build().apply(updateCursor(mi), mi.getCoordinates().replace(), mi.getArguments().get(0), mi.getSelect());
+                            .build()
+                            .apply(updateCursor(mi), mi.getCoordinates().replace(), mi.getArguments().get(0), mi.getSelect());
                 }
                 return mi;
             }