Avoid potential NPE when collecting RESTEasy Providers on Resource cl…

…asses Addresses: quarkusio#14418 (comment) (cherry picked from commit e104aa1)
gsmet · Jan 19, 2022 · 1202718 · 1202718
1 parent 43ac218
commit 1202718
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/...ployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java b/...ployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java
@@ -531,8 +531,10 @@ private static boolean collectDeclaredProvidersForMethodAndMediaTypeAnnotation(S
             AnnotationInstance mediaTypeClassAnnotationInstance = methodTarget.declaringClass()
                     .classAnnotation(mediaTypeAnnotation);
             if (mediaTypeClassAnnotationInstance != null) {
-                if (collectDeclaredProvidersForMediaTypeAnnotationInstance(providersToRegister, categorizedProviders,
-                        mediaTypeClassAnnotationInstance.value().asStringArray(), methodTarget)) {
+                AnnotationValue mediaTypeClassValue = mediaTypeClassAnnotationInstance.value();
+                if ((mediaTypeClassValue != null)
+                        && collectDeclaredProvidersForMediaTypeAnnotationInstance(providersToRegister, categorizedProviders,
+                                mediaTypeClassValue.asStringArray(), methodTarget)) {
                     return true;
                 }
                 return false;

diff --git a/...assic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NoProducesValueTest.java b/...assic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/NoProducesValueTest.java
@@ -0,0 +1,38 @@
+package io.quarkus.resteasy.test;
+
+import static io.restassured.RestAssured.given;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class NoProducesValueTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .withApplicationRoot((jar) -> jar
+                    .addClasses(TestResource.class));
+
+    @Test
+    public void testSomething() {
+        given().when().get("/test/hello")
+                .then().statusCode(200);
+    }
+
+    @Produces
+    @Path("test")
+    public static class TestResource {
+
+        @GET
+        @Path("hello")
+        public Response getHello() {
+            return Response.ok().build();
+        }
+    }
+}