- detect repeating and remove methods annotation

Author: arodionov

src/main/java/org/openrewrite/java/spring/NotRepeatSpringAnnotationsInSubclasses.java

@@ -19,9 +19,19 @@
 import org.openrewrite.Preconditions;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.java.AnnotationMatcher;
 import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.RemoveAnnotation;
 import org.openrewrite.java.search.UsesType;
 import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaType;
+import org.openrewrite.java.tree.TypeUtils;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 public class NotRepeatSpringAnnotationsInSubclasses extends Recipe {
 
@@ -37,17 +47,41 @@ public String getDescription() {
 
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
-        return Preconditions.check(new UsesType<>("org.springframework.web.bind.annotation.PostMapping", false), new JavaIsoVisitor<ExecutionContext>() {
+        //return Preconditions.check(new UsesType<>("org.springframework.web.bind.annotation.PostMapping", false), new JavaIsoVisitor<ExecutionContext>() {
+        return new JavaIsoVisitor<ExecutionContext>() {
             @Override
             public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
                 J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx);
                 return cd;
             }
 
             @Override
-            public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext executionContext) {
-                return super.visitMethodDeclaration(method, executionContext);
+            public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
+                J.MethodDeclaration md = super.visitMethodDeclaration(method, ctx);
+
+                Optional<JavaType.Method> overriddenMethod = TypeUtils.findOverriddenMethod(md.getMethodType());
+                if (overriddenMethod.isPresent()) {
+
+                    JavaType.Method overrideMethod = overriddenMethod.get();
+
+                    List<JavaType.FullyQualified> baseAnnotations = overrideMethod.getAnnotations();
+                    List<JavaType.FullyQualified> methodAnnotations = md.getMethodType().getAnnotations();
+                    List<JavaType.FullyQualified> nonRepeated = methodAnnotations.stream()
+                            .filter(a -> baseAnnotations.stream().noneMatch(b -> TypeUtils.isOfType(a, b)))
+                            .collect(Collectors.toList());
+
+                    List<J.Annotation> annotations = ListUtils.map(md.getLeadingAnnotations(),
+                            a -> {
+                                if (nonRepeated.stream().noneMatch(n -> TypeUtils.isOfType(a.getType(), ((JavaType.Annotation)n).getType())))
+                                return (J.Annotation) new RemoveAnnotation(a.getType().toString()).getVisitor().visit(a, ctx, getCursor().getParentOrThrow());
+                                return a;
+                            });
+                    md = md.withLeadingAnnotations(annotations);
+
+
+                }
+                return md;
             }
-        });
+        };
     }
 }

src/testWithSpringBoot_1_5/java/org/openrewrite/java/spring/NotRepeatSpringAnnotationsInSubclassesTest.java

@@ -28,48 +28,49 @@ class NotRepeatSpringAnnotationsInSubclassesTest implements RewriteTest {
     public void defaults(RecipeSpec spec) {
         spec.recipe(new NotRepeatSpringAnnotationsInSubclasses())
           .parser(JavaParser.fromJavaVersion().classpath("spring-beans", "spring-boot",
-            "spring-context", "spring-core", "spring-web"));
-    }
-
-    @Test
-    void removeLeadingAutowiredAnnotation() {
-        //language=java
-        rewriteRun(
-          java(
-          """
-          import org.springframework.web.bind.annotation.PathVariable;
+            "spring-context", "spring-core", "spring-web")
+            .dependsOn(
+              """
+                 import org.springframework.web.bind.annotation.PathVariable;
           import org.springframework.web.bind.annotation.PostMapping;
           import org.springframework.web.bind.annotation.RequestBody;
+
           public interface UserApi {
               @PostMapping("/users/{id}")
               String updateUser(
                   @PathVariable("id") Long id,
                   @RequestBody UserData request
               );
+
               class UserData {
                   private String firstName;
                   private String lastName;
-                  public String getFirstName() {return firstName;}
+
+                  public String getFirstName() {
+                      return firstName;
+                  }
+
                   public void setFirstName(String firstName) {
                       this.firstName = firstName;
                   }
+
                   public String getLastName() {
                       return lastName;
                   }
+
                   public void setLastName(String lastName) {
                       this.lastName = lastName;
-          }
-          """
-          ),
-                          return lastName;
-                      }
-
-                      public void setLastName(String lastName) {
-                          this.lastName = lastName;
-                      }
                   }
               }
-          """),
+          }
+                """
+            ));
+    }
+
+    @Test
+    void removeLeadingAutowiredAnnotation() {
+        //language=java
+        rewriteRun(
           java(
             """
               import org.springframework.web.bind.annotation.PathVariable;
@@ -80,8 +81,8 @@ public void setLastName(String lastName) {
               @RestController
               public class UserController implements UserApi {
 
-                  @PostMapping("/users/{id}")
-                  String updateUser(
+                  @Override @PostMapping("/users/{id}")
+                  public String updateUser(
                       @PathVariable("id") Long id,
                       @RequestBody UserData request
                   ) {