Fix #11 NoRequestMappingAnnotation produces broken annotations when there are multiple values

Author: sambsnyd

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

@@ -16,12 +16,14 @@
 package org.openrewrite.java.spring;
 
 import org.openrewrite.AutoConfigure;
+import org.openrewrite.Formatting;
 import org.openrewrite.java.JavaRefactorVisitor;
 import org.openrewrite.java.tree.Expression;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.JavaType;
 
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toList;
 import static org.openrewrite.Formatting.EMPTY;
@@ -63,7 +65,7 @@ public J visitAnnotation(J.Annotation annotation) {
                                                                 .orElse(null)))
                                                         .map(methodEnum -> {
                                                             maybeRemoveImport("org.springframework.web.bind.annotation.RequestMethod");
-                                                            return methodEnum.getSimpleName().substring(0, 1) + methodEnum.getSimpleName().substring(1).toLowerCase() + "Mapping";
+                                                            return methodEnum.getSimpleName().charAt(0) + methodEnum.getSimpleName().substring(1).toLowerCase() + "Mapping";
                                                         }))
                                 ))
                         .filter(Optional::isPresent)
@@ -89,6 +91,28 @@ public J visitAnnotation(J.Annotation annotation) {
                                 .orElse(arg))
                         .collect(toList()));
 
+                // If more than one argument remains, ensure that there's a "value =" before the value argument
+                if(args.getArgs().size() > 1) {
+                    args = args.withArgs(args.getArgs().stream()
+                            .map(it -> {
+                                if(it instanceof J.Literal) {
+                                    return new J.Assign(
+                                            randomId(),
+                                            J.Ident.build(
+                                                    randomId(),
+                                                    "value",
+                                                    null,
+                                                    Formatting.format("", " ")),
+                                            ((J.Literal) it).withFormatting(Formatting.format(" ")),
+                                            JavaType.Class.build("java.lang.String"),
+                                            EMPTY);
+                                } else {
+                                    return it;
+                                }
+                            })
+                            .collect(toList()));
+                }
+
                 // remove the argument parentheses altogether
                 if (args.getArgs().isEmpty()) {
                     args = null;

src/test/kotlin/org/openrewrite/java/spring/NoRequestMappingAnnotationTest.kt

@@ -16,7 +16,6 @@
 package org.openrewrite.java.spring
 
 import org.junit.jupiter.api.Test
-import org.openrewrite.Issue
 import org.openrewrite.RefactorVisitor
 import org.openrewrite.RefactorVisitorTestForParser
 import org.openrewrite.java.JavaParser
@@ -159,7 +158,6 @@ class NoRequestMappingAnnotationTest : RefactorVisitorTestForParser<J.Compilatio
             """
     )
 
-    @Issue("#3")
     @Test
     fun requestMappingWithMultipleMethods() = assertUnchanged(
             before = """
@@ -179,4 +177,38 @@ class NoRequestMappingAnnotationTest : RefactorVisitorTestForParser<J.Compilatio
                 }
             """
     )
+
+    @Test
+    fun multipleParameters() = assertRefactored(
+            before = """
+                import java.util.*;
+                import org.springframework.http.ResponseEntity;
+                import org.springframework.web.bind.annotation.*;
+                import org.springframework.http.MediaType;
+                
+                @RestController
+                @RequestMapping("/users")
+                public class UsersController {
+                    @RequestMapping(value = "/user/{userId}/edit", method = RequestMethod.POST, produces = { MediaType.APPLICATION_JSON_VALUE })
+                    public ResponseEntity<List<String>> getUsersPost(String userId) {
+                        return null;
+                    }
+                }
+            """,
+            after = """
+                import java.util.*;
+                import org.springframework.http.ResponseEntity;
+                import org.springframework.web.bind.annotation.*;
+                import org.springframework.http.MediaType;
+                
+                @RestController
+                @RequestMapping("/users")
+                public class UsersController {
+                    @PostMapping(value = "/user/{userId}/edit", produces = { MediaType.APPLICATION_JSON_VALUE })
+                    public ResponseEntity<List<String>> getUsersPost(String userId) {
+                        return null;
+                    }
+                }
+            """
+    )
 }