Support NewClass in MethodMatcher and ChangeMethodName

For openrewrite/rewrite-migrate-java#434
openrewrite · May 6, 2024 · 415bc28 · 415bc28
1 parent ba548dc
commit 415bc28
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 4 deletions.
diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/ChangeMethodNameTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/ChangeMethodNameTest.java
@@ -93,6 +93,38 @@ public void test() {
         );
     }
 
+    @Test
+    void changeMethodNameForOverriddenMethodAnonymousClass() {
+        rewriteRun(
+          spec -> spec.recipe(new ChangeMethodName("com.abc.B singleArg(String)", "bar", true, null)),
+          java(b, SourceSpec::skip),
+          java(
+            """
+              package com.abc;
+              class A {
+                   public void test() {
+                       new B() {
+                           @Override
+                           public void singleArg(String s) {}
+                       };
+                   }
+              }
+              """,
+            """
+              package com.abc;
+              class A {
+                   public void test() {
+                       new B() {
+                           @Override
+                           public void bar(String s) {}
+                       };
+                   }
+              }
+              """
+          )
+        );
+    }
+
     @Test
     @Issue("https://github.com/openrewrite/rewrite/issues/1215")
     @SuppressWarnings("MethodMayBeStatic")

diff --git a/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodName.java b/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodName.java
@@ -95,11 +95,12 @@ public J visit(@Nullable Tree tree, ExecutionContext ctx) {
             @Override
             public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
                 J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx);
+
+                J.NewClass newClass = getCursor().firstEnclosing(J.NewClass.class);
                 J.ClassDeclaration classDecl = getCursor().firstEnclosing(J.ClassDeclaration.class);
-                if (classDecl == null) {
-                    return m;
-                }
-                if (methodMatcher.matches(method, classDecl)) {
+                boolean methodMatches = newClass != null && methodMatcher.matches(method, newClass) ||
+                                        classDecl != null && methodMatcher.matches(method, classDecl);
+                if (methodMatches) {
                     JavaType.Method type = m.getMethodType();
                     if (type != null) {
                         type = type.withName(newMethodName);

diff --git a/rewrite-java/src/main/java/org/openrewrite/java/MethodMatcher.java b/rewrite-java/src/main/java/org/openrewrite/java/MethodMatcher.java
@@ -268,6 +268,33 @@ public boolean matches(J.MethodDeclaration method, J.ClassDeclaration enclosing)
         return matchesParameterTypes(parameterTypes);
     }
 
+    public boolean matches(J.MethodDeclaration method, J.NewClass enclosing) {
+        if (enclosing.getType() == null) {
+            return false;
+        }
+
+        // aspectJUtils does not support matching classes separated by packages.
+        // [^.]* is the product of a fully wild card match for a method. `* foo()`
+        boolean matchesTargetType = (targetTypePattern != null && "[^.]*".equals(targetTypePattern.pattern()))
+                                    || TypeUtils.isAssignableTo(targetType, enclosing.getType());
+        if (!matchesTargetType) {
+            return false;
+        }
+
+        if (method.getMethodType() != null && !matchesMethodName(method.getMethodType().getName())) {
+            return false;
+        }
+
+        List<JavaType> parameterTypes =
+                method
+                        .getParameters()
+                        .stream()
+                        .map(MethodMatcher::variableDeclarationsType)
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toList());
+        return matchesParameterTypes(parameterTypes);
+    }
+
     @Nullable
     private static JavaType variableDeclarationsType(Statement v) {
         if (v instanceof J.VariableDeclarations) {