Shorten MaintainTrailingSlashURLMappings code by using an inline visitor (#746)

Author: jevanlingen

src/main/java/org/openrewrite/java/spring/boot3/MaintainTrailingSlashURLMappings.java

@@ -57,11 +57,18 @@ public AtomicBoolean getInitialValue(ExecutionContext ctx) {
     public TreeVisitor<?, ExecutionContext> getScanner(AtomicBoolean acc) {
         return new JavaIsoVisitor<ExecutionContext>() {
             @Override
-            public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
-                if (!acc.get()) {
-                    acc.set(FindWebConfigurer.find(cu));
+            public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
+                if (!acc.get() && classDecl.getImplements() != null) {
+                    for (TypeTree impl : classDecl.getImplements()) {
+                        JavaType.FullyQualified fullyQualified = TypeUtils.asFullyQualified(impl.getType());
+                        if (fullyQualified != null &&
+                                (WEB_MVC_CONFIGURER.equals(fullyQualified.getFullyQualifiedName()) ||
+                                        WEB_FLUX_CONFIGURER.equals(fullyQualified.getFullyQualifiedName()))) {
+                            acc.set(true);
+                        }
+                    }
                 }
-                return cu;
+                return super.visitClassDeclaration(classDecl, ctx);
             }
         };
     }
@@ -74,33 +81,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor(AtomicBoolean acc) {
                 if (acc.get()) {
                     return new AddSetUseTrailingSlashMatch().getVisitor().visit(tree, ctx);
                 }
-
                 return new AddRouteTrailingSlash().getVisitor().visit(tree, ctx);
             }
         };
     }
-
-    private static class FindWebConfigurer extends JavaIsoVisitor<AtomicBoolean> {
-        static boolean find(J j) {
-            return new FindWebConfigurer()
-                .reduce(j, new AtomicBoolean()).get();
-        }
-
-        @Override
-        public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, AtomicBoolean found) {
-            if (classDecl.getImplements() != null) {
-                for (TypeTree impl : classDecl.getImplements()) {
-                    JavaType.FullyQualified fullyQualified = TypeUtils.asFullyQualified(impl.getType());
-                    if (fullyQualified != null &&
-                        (WEB_MVC_CONFIGURER.equals(fullyQualified.getFullyQualifiedName()) ||
-                         WEB_FLUX_CONFIGURER.equals(fullyQualified.getFullyQualifiedName()))
-                    ) {
-                        found.set(true);
-                        return classDecl;
-                    }
-                }
-            }
-            return classDecl;
-        }
-    }
 }

src/testWithSpringBoot_2_7/java/org/openrewrite/java/spring/boot2/MaintainTrailingSlashURLMappingsTest.java

@@ -36,14 +36,15 @@ public void defaults(RecipeSpec spec) {
     @DocumentExample
     @Test
     void noConfigOverridden() {
+        //language=java
         rewriteRun(
           java(
             """
               import org.springframework.web.bind.annotation.*;
-                
+
               @RestController
               public class ExampleController {
-                
+
                   @GetMapping("/get")
                   public String getExample() {
                       return "This is a GET example.";
@@ -52,10 +53,10 @@ public String getExample() {
               """,
             """
               import org.springframework.web.bind.annotation.*;
-                
+
               @RestController
               public class ExampleController {
-                
+
                   @GetMapping({"/get", "/get/"})
                   public String getExample() {
                       return "This is a GET example.";
@@ -76,7 +77,7 @@ void noChangeWithConfigOverriddenByWebMvcConfigurer() {
 
               @RestController
               public class ExampleController {
-                
+
                   @GetMapping("/get")
                   public String getExample() {
                       return "This is a GET example.";
@@ -104,14 +105,15 @@ public void configurePathMatch(PathMatchConfigurer configurer) {
 
     @Test
     void addSetUseTrailingSlashMatchForWebMvcConfigurer() {
+        //language=java
         rewriteRun(
           java(
             """
               import org.springframework.web.bind.annotation.*;
 
               @RestController
               public class ExampleController {
-                
+
                   @GetMapping("/get")
                   public String getExample() {
                       return "This is a GET example.";
@@ -151,14 +153,15 @@ public void configurePathMatch(PathMatchConfigurer configurer) {
 
     @Test
     void noChangeWithConfigOverriddenByWebFluxConfigurer() {
+        //language=java
         rewriteRun(
           java(
             """
               import org.springframework.web.bind.annotation.*;
-                
+
               @RestController
               public class ExampleController {
-                
+
                   @GetMapping("/get")
                   public String getExample() {
                       return "This is a GET example.";
@@ -186,14 +189,15 @@ public void configurePathMatching(PathMatchConfigurer configurer) {
 
     @Test
     void addSetUseTrailingSlashForWebFluxConfigurer() {
+        //language=java
         rewriteRun(
           java(
             """
               import org.springframework.web.bind.annotation.*;
-                
+
               @RestController
               public class ExampleController {
-                
+
                   @GetMapping("/get")
                   public String getExample() {
                       return "This is a GET example.";