Remove one additional super call no longer allowed

Author: timtebeek

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

@@ -266,7 +266,6 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                 return cd;
             }
 
-
             if (initMethodDeclarationTemplate != null) {
                 cd = initMethodDeclarationTemplate.apply(updateCursor(cd), cd.getBody().getCoordinates().lastStatement());
                 J.Block finalBody = cd.getBody();
@@ -382,26 +381,20 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                             })
                             .collect(Collectors.toSet());
                     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;
+                    })));
                 }
             }
             return m;
         }
-
-        @Override
-        public J.@Nullable MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
-            J.MethodInvocation mi = super.visitMethodInvocation(method, ctx);
-            J.MethodDeclaration enclosingMethod = getCursor().firstEnclosing(J.MethodDeclaration.class);
-            // remove redundant super call, otherwise it will create compilation error when this constructor is converted to regular method.
-            // TODO: Handle super call with arguments.
-            if (enclosingMethod != null && enclosingMethod.isConstructor() && mi.getName().getSimpleName().equals("super") && isEmptyArgs(mi)) {
-                return null;
-            }
-            return mi;
-        }
-
-        private static boolean isEmptyArgs(J.MethodInvocation mi) {
-            return mi.getArguments().isEmpty() ||
-                    (mi.getArguments().size() == 1 && mi.getArguments().get(0) instanceof J.Empty);
-        }
     }
 }

src/test/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterizedTest.java

@@ -497,7 +497,6 @@ public static Collection<Object[]> data1() {
                       }
 
                       public void initI1(String path) {
-                          super(path);
                       }
 
                       @MethodSource("data1")