forked from quarkusio/quarkus
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Don't ignore Spring Rest controllers interfaces if contains errors
Related to quarkusio#43704
- Loading branch information
1 parent
57f0e20
commit 6897774
Showing
5 changed files
with
101 additions
and
1 deletion.
There are no files selected for viewing
17 changes: 17 additions & 0 deletions
17
...src/main/java/io/quarkus/spring/web/deployment/SpringRestControllerAnnotationHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package io.quarkus.spring.web.deployment; | ||
|
||
import org.jboss.jandex.ClassInfo; | ||
import org.jboss.jandex.DotName; | ||
import org.jboss.resteasy.reactive.common.processor.EndpointAnnotationHandler; | ||
|
||
public class SpringRestControllerAnnotationHandler implements EndpointAnnotationHandler { | ||
public static final DotName SPRING_REST_CONTROLLER = DotName | ||
.createSimple("org.springframework.web.bind.annotation.RestController"); | ||
|
||
@Override | ||
public boolean isEndpointAnnotationValid(ClassInfo classInfo) { | ||
return classInfo | ||
.declaredAnnotation(SPRING_REST_CONTROLLER) != null; | ||
} | ||
|
||
} |
48 changes: 48 additions & 0 deletions
48
...arkus/spring/web/resteasy/reactive/test/UnbuildableSpringRestControllerInterfaceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
package io.quarkus.spring.web.resteasy.reactive.test; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
import static org.assertj.core.api.Assertions.fail; | ||
|
||
import jakarta.ws.rs.QueryParam; | ||
|
||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.RegisterExtension; | ||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.PostMapping; | ||
import org.springframework.web.bind.annotation.RequestMapping; | ||
import org.springframework.web.bind.annotation.RequestParam; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
import io.quarkus.test.QuarkusProdModeTest; | ||
|
||
public class UnbuildableSpringRestControllerInterfaceTest { | ||
|
||
@RegisterExtension | ||
static final QuarkusProdModeTest config = new QuarkusProdModeTest() | ||
.withApplicationRoot((jar) -> jar | ||
.addClasses(UnbuildableControllerInterface.class)) | ||
.setApplicationName("unbuildable-rest-controller-interface") | ||
.setApplicationVersion("0.1-SNAPSHOT") | ||
.assertBuildException(throwable -> { | ||
assertThat(throwable).isInstanceOf(RuntimeException.class); | ||
assertThat(throwable).hasMessageContaining( | ||
"Cannot have more than one of @PathParam, @QueryParam, @HeaderParam, @FormParam, @CookieParam, @BeanParam, @Context on method"); | ||
}); | ||
|
||
@Test | ||
public void testBuildLogs() { | ||
fail("Should not be called"); | ||
} | ||
|
||
@RestController | ||
@RequestMapping("/unbuildable") | ||
public interface UnbuildableControllerInterface { | ||
@GetMapping("/ping") | ||
String ping(); | ||
|
||
@PostMapping("/hello") | ||
String hello(@RequestParam(required = false) @QueryParam("dung") String params); | ||
|
||
} | ||
|
||
} |
18 changes: 18 additions & 0 deletions
18
...n/java/org/jboss/resteasy/reactive/common/processor/DefaultEndpointAnnotationHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package org.jboss.resteasy.reactive.common.processor; | ||
|
||
import java.lang.reflect.Modifier; | ||
|
||
import org.jboss.jandex.ClassInfo; | ||
|
||
public class DefaultEndpointAnnotationHandler implements EndpointAnnotationHandler { | ||
public DefaultEndpointAnnotationHandler() { | ||
} | ||
|
||
@Override | ||
public boolean isEndpointAnnotationValid(ClassInfo classInfo) { | ||
if (Modifier.isInterface(classInfo.flags()) || Modifier.isAbstract(classInfo.flags())) { | ||
return true; | ||
} | ||
return false; | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
...src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointAnnotationHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package org.jboss.resteasy.reactive.common.processor; | ||
|
||
import org.jboss.jandex.ClassInfo; | ||
|
||
public interface EndpointAnnotationHandler { | ||
|
||
boolean isEndpointAnnotationValid(ClassInfo classInfo); | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters