Fix scanning of empty SecurityRequirements on resource class (#2012)

Signed-off-by: Michael Edgar <[email protected]>
smallrye · Oct 10, 2024 · e44da1b · e44da1b
1 parent bba36d1
commit e44da1b
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 20 deletions.
diff --git a/core/src/main/java/io/smallrye/openapi/runtime/scanner/spi/AnnotationScanner.java b/core/src/main/java/io/smallrye/openapi/runtime/scanner/spi/AnnotationScanner.java
@@ -665,6 +665,7 @@ default void processSecurityRequirementAnnotation(AnnotationScannerContext conte
 
         if (securityRequirements.isEmpty() && !emptyContainerPresent) {
             securityRequirements = context.io().securityIO().readRequirements(resourceClass);
+            emptyContainerPresent = isEmptySecurityRequirements(context, resourceClass);
         }
 
         if (securityRequirements.isEmpty() && emptyContainerPresent) {

diff --git a/...n-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/JaxRsAnnotationScannerTest.java b/...n-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/JaxRsAnnotationScannerTest.java
@@ -27,6 +27,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import io.smallrye.openapi.api.OpenApiConfig;
 import io.smallrye.openapi.api.OpenApiDocument;
@@ -286,24 +287,15 @@ void testTagScanning_OrderGivenStaticFile(Index i) throws IOException, JSONExcep
         assertJsonEquals("resource.tags.ordergiven.staticfile.json", result);
     }
 
-    @Test
-    void testJavaxEmptySecurityRequirements() throws IOException, JSONException {
-        Indexer indexer = new Indexer();
-        index(indexer, "test/io/smallrye/openapi/runtime/scanner/resources/javax/EmptySecurityRequirementsResource.class");
-
-        testEmptySecurityRequirements(indexer.complete());
-    }
-
-    @Test
-    void testJakartaEmptySecurityRequirements() throws IOException, JSONException {
-        Indexer indexer = new Indexer();
-        index(indexer, "test/io/smallrye/openapi/runtime/scanner/resources/jakarta/EmptySecurityRequirementsResource.class");
-
-        testEmptySecurityRequirements(indexer.complete());
-    }
-
-    void testEmptySecurityRequirements(Index i) throws IOException, JSONException {
-        OpenApiAnnotationScanner scanner = new OpenApiAnnotationScanner(emptyConfig(), i);
+    @ParameterizedTest
+    @ValueSource(classes = {
+            test.io.smallrye.openapi.runtime.scanner.resources.jakarta.EmptySecurityRequirementsResource.class,
+            test.io.smallrye.openapi.runtime.scanner.resources.jakarta.EmptySecurityRequirementsResourceMethod.class,
+            test.io.smallrye.openapi.runtime.scanner.resources.javax.EmptySecurityRequirementsResource.class,
+            test.io.smallrye.openapi.runtime.scanner.resources.javax.EmptySecurityRequirementsResourceMethod.class,
+    })
+    void testEmptySecurityRequirements(Class<?> resourceClass) throws IOException, JSONException {
+        OpenApiAnnotationScanner scanner = new OpenApiAnnotationScanner(emptyConfig(), Index.of(resourceClass));
 
         OpenAPI result = scanner.scan("JAX-RS");
 

diff --git a/...smallrye/openapi/runtime/scanner/resources/jakarta/EmptySecurityRequirementsResource.java b/...smallrye/openapi/runtime/scanner/resources/jakarta/EmptySecurityRequirementsResource.java
@@ -6,10 +6,10 @@
 import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirements;
 
 @Path("/public")
+@SecurityRequirements
 public class EmptySecurityRequirementsResource {
 
     @GET
-    @SecurityRequirements
     public String getPublicResponse() {
         return "response value";
     }

diff --git a/...ye/openapi/runtime/scanner/resources/jakarta/EmptySecurityRequirementsResourceMethod.java b/...ye/openapi/runtime/scanner/resources/jakarta/EmptySecurityRequirementsResourceMethod.java
@@ -0,0 +1,16 @@
+package test.io.smallrye.openapi.runtime.scanner.resources.jakarta;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+
+import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirements;
+
+@Path("/public")
+public class EmptySecurityRequirementsResourceMethod {
+
+    @GET
+    @SecurityRequirements
+    public String getPublicResponse() {
+        return "response value";
+    }
+}
diff --git a/...o/smallrye/openapi/runtime/scanner/resources/javax/EmptySecurityRequirementsResource.java b/...o/smallrye/openapi/runtime/scanner/resources/javax/EmptySecurityRequirementsResource.java
@@ -6,10 +6,10 @@
 import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirements;
 
 @Path("/public")
+@SecurityRequirements
 public class EmptySecurityRequirementsResource {
 
     @GET
-    @SecurityRequirements
     public String getPublicResponse() {
         return "response value";
     }

diff --git a/...lrye/openapi/runtime/scanner/resources/javax/EmptySecurityRequirementsResourceMethod.java b/...lrye/openapi/runtime/scanner/resources/javax/EmptySecurityRequirementsResourceMethod.java
@@ -0,0 +1,16 @@
+package test.io.smallrye.openapi.runtime.scanner.resources.javax;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.openapi.annotations.security.SecurityRequirements;
+
+@Path("/public")
+public class EmptySecurityRequirementsResourceMethod {
+
+    @GET
+    @SecurityRequirements
+    public String getPublicResponse() {
+        return "response value";
+    }
+}