Adjust FindMethods recipe for new MethodCalls.Row constructor

openrewrite · Aug 21, 2023 · 5ec34c7 · 5ec34c7
1 parent 2989d87
commit 5ec34c7
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/src/main/java/org/openrewrite/analysis/search/FindMethods.java b/src/main/java/org/openrewrite/analysis/search/FindMethods.java
@@ -29,6 +29,7 @@
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.search.UsesMethod;
 import org.openrewrite.java.table.MethodCalls;
+import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.JavaSourceFile;
 import org.openrewrite.marker.SearchResult;
@@ -93,7 +94,13 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                         if (javaSourceFile != null) {
                             methodCalls.insertRow(ctx, new MethodCalls.Row(
                                     javaSourceFile.getSourcePath().toString(),
-                                    method.printTrimmed(getCursor())
+                                    method.printTrimmed(getCursor()),
+                                    method.getMethodType().getDeclaringType().getFullyQualifiedName(),
+                                    method.getSimpleName(),
+                                    method.getArguments().stream()
+                                            .map(Expression::getType)
+                                            .map(String::valueOf)
+                                            .collect(Collectors.joining(", "))
                             ));
                         }
                         m = SearchResult.found(m);
@@ -113,7 +120,13 @@ public J.MemberReference visitMemberReference(J.MemberReference memberRef, Execu
                         if (javaSourceFile != null) {
                             methodCalls.insertRow(ctx, new MethodCalls.Row(
                                     javaSourceFile.getSourcePath().toString(),
-                                    memberRef.printTrimmed(getCursor())
+                                    memberRef.printTrimmed(getCursor()),
+                                    memberRef.getMethodType().getDeclaringType().getFullyQualifiedName(),
+                                    memberRef.getMethodType().getName(),
+                                    memberRef.getArguments().stream()
+                                            .map(Expression::getType)
+                                            .map(String::valueOf)
+                                            .collect(Collectors.joining(", "))
                             ));
                         }
                         m = m.withReference(SearchResult.found(m.getReference()));
@@ -133,7 +146,13 @@ public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext ctx) {
                         if (javaSourceFile != null) {
                             methodCalls.insertRow(ctx, new MethodCalls.Row(
                                     javaSourceFile.getSourcePath().toString(),
-                                    newClass.printTrimmed(getCursor())
+                                    newClass.printTrimmed(getCursor()),
+                                    newClass.getType().toString(),
+                                    "<constructor>",
+                                    newClass.getArguments().stream()
+                                            .map(Expression::getType)
+                                            .map(String::valueOf)
+                                            .collect(Collectors.joining(", "))
                             ));
                         }
                         n = SearchResult.found(n);