Trim how we remove super call

Author: timtebeek

src/main/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterized.java

@@ -76,7 +76,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
 
                 // Constructor Injected Test
                 if (parametersMethodName != null && constructorParams != null && constructorParams.stream().anyMatch(org.openrewrite.java.tree.J.VariableDeclarations.class::isInstance)) {
-                    doAfterVisit(new ParameterizedRunnerToParameterizedTestsVisitor(classDecl, parametersMethodName, initMethodName, parametersAnnotationArguments, constructorParams, true, beforeMethodName,ctx));
+                    doAfterVisit(new ParameterizedRunnerToParameterizedTestsVisitor(classDecl, parametersMethodName, initMethodName, parametersAnnotationArguments, constructorParams, true, beforeMethodName, ctx));
                 }
 
                 // Field Injected Test
@@ -290,7 +290,7 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                     if (statement instanceof J.VariableDeclarations) {
                         J.VariableDeclarations varDecls = (J.VariableDeclarations) statement;
                         if (varDecls.getVariables().stream().anyMatch(it -> fieldNames.contains(it.getSimpleName())) &&
-                            (varDecls.hasModifier(J.Modifier.Type.Final))) {
+                                (varDecls.hasModifier(J.Modifier.Type.Final))) {
                             varDecls = varDecls.withModifiers(ListUtils.map(varDecls.getModifiers(), mod -> mod.getType() == J.Modifier.Type.Final ? null : mod));
                             statement = maybeAutoFormat(statement, varDecls, ctx, new Cursor(getCursor(), finalBody));
                         }
@@ -383,15 +383,10 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                     getCursor().dropParentUntil(J.ClassDeclaration.class::isInstance).putMessage("INIT_VARS", fieldNames);
 
                     // Remove any potential super call
-                    m = m.withBody(m.getBody().withStatements(ListUtils.mapFirst(m.getBody().getStatements(), stmt -> {
-                        if (stmt instanceof J.MethodInvocation) {
-                            J.MethodInvocation mi = (J.MethodInvocation) stmt;
-                            if (mi.getName().getSimpleName().equals("super")) {
-                                return null;
-                            }
-                        }
-                        return stmt;
-                    })));
+                    m = m.withBody(m.getBody().withStatements(ListUtils.mapFirst(m.getBody().getStatements(),
+                            stmt -> stmt instanceof J.MethodInvocation &&
+                                    "super".equals(((J.MethodInvocation) stmt).getSimpleName()) ?
+                                    null : stmt)));
                 }
             }
             return m;