Merge pull request quarkusio#4474 from aureamunoz/compiler-options-sp…

…ring-it test: add spring-web integration test with @PathVariable without configuration
kenfinnigan · Oct 29, 2019 · d171c19 · d171c19
2 parents 11602b0 + bad1edc
commit d171c19
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -2421,7 +2421,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            
+
             <!-- Keycloak -->
             <dependency>
                 <groupId>org.keycloak</groupId>

diff --git a/...ing-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java b/...ing-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java
@@ -193,14 +193,6 @@ private void validate(Collection<AnnotationInstance> restControllerInstances) {
                         if (pathVariableInstance.target().kind() != AnnotationTarget.Kind.METHOD_PARAMETER) {
                             continue;
                         }
-                        if ((pathVariableInstance.value() == null) && (pathVariableInstance.value("name") == null)) {
-                            MethodInfo method = pathVariableInstance.target().asMethodParameter().method();
-                            throw new IllegalArgumentException(
-                                    "Currently method parameters annotated with @PathVariable must supply a value for 'name' or 'value'."
-                                            +
-                                            "Offending method is " + method.declaringClass().name() + "#" + method.name());
-                        }
-
                     }
                 }
             }

diff --git a/integration-tests/spring-web/pom.xml b/integration-tests/spring-web/pom.xml
@@ -58,6 +58,12 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <parameters>true</parameters>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/GreetingController.java b/integration-tests/spring-web/src/main/java/io/quarkus/it/spring/web/GreetingController.java
@@ -7,6 +7,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -20,8 +21,8 @@ public GreetingController(GreetingService greetingService) {
     }
 
     @GetMapping(path = "/json/{message}")
-    public Greeting greet(@PathVariable(name = "message") String message) {
-        return greetingService.greet(message);
+    public Greeting greet(@PathVariable String message, @RequestParam String suffix) {
+        return greetingService.greet(message + suffix);
     }
 
     @PostMapping(path = "/person")

diff --git a/...gration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/SpringControllerTest.java b/...gration-tests/spring-web/src/test/java/io/quarkus/it/spring/web/SpringControllerTest.java
@@ -18,6 +18,13 @@ public void testJsonResult() {
                 .body(containsString("hello"));
     }
 
+    @Test
+    public void testJsonResult2() {
+        RestAssured.when().get("/greeting/json/hello?suffix=000").then()
+                .contentType("application/json")
+                .body(containsString("hello000"));
+    }
+
     @Test
     public void testInvalidJsonInputAndResult() {
         RestAssured.given().contentType("application/json").body("{\"name\":\"\"}").post("/greeting/person").then()