Spring: Make sure produces on method mappings are used (master)

extension-spring/src/main/java/io/smallrye/openapi/spring/SpringAnnotationScanner.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -366,25 +367,32 @@ private void processControllerMethod(final AnnotationScannerContext context,
     }
 
     static Optional<String[]> getMediaTypes(MethodInfo resourceMethod, String property, String[] defaultValue) {
-        Set<DotName> annotationNames = SpringConstants.HTTP_METHODS;
+        Set<DotName> annotationNames = new HashSet<>(SpringConstants.HTTP_METHODS);
+        annotationNames.add(SpringConstants.REQUEST_MAPPING);
 
+        // Check methods
         for (DotName annotationName : annotationNames) {
             AnnotationInstance annotation = resourceMethod.annotation(annotationName);
-
-            if (annotation == null || annotation.value(property) == null) {
-                annotation = JandexUtil.getClassAnnotation(resourceMethod.declaringClass(), SpringConstants.REQUEST_MAPPING);
-            }
-
             if (annotation != null) {
                 AnnotationValue annotationValue = annotation.value(property);
-
                 if (annotationValue != null) {
                     return Optional.of(annotationValue.asStringArray());
                 }
+            }
+        }
 
-                return Optional.of(defaultValue);
+        // Check class
+        AnnotationInstance annotation = JandexUtil.getClassAnnotation(resourceMethod.declaringClass(),
+                SpringConstants.REQUEST_MAPPING);
+        if (annotation != null) {
+            AnnotationValue annotationValue = annotation.value(property);
+            if (annotationValue != null) {
+                return Optional.of(annotationValue.asStringArray());
             }
+
+            return Optional.of(defaultValue);
         }
+
         return Optional.empty();
     }
 }

extension-spring/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingGetController.java

@@ -64,4 +64,11 @@ public ResponseEntity helloPathVariableWithResponse(@PathVariable(name = "name")
     public ResponseEntity<Greeting> helloPathVariableWithResponseTyped(@PathVariable(name = "name") String name) {
         return ResponseEntity.ok(new Greeting("Hello " + name));
     }
+
+    // 7) Test override of produces
+    @GetMapping(value = "/overrideProduces/{name}", produces = MediaType.TEXT_PLAIN_VALUE)
+    public String overrideProduces(@PathVariable(name = "name") String name) {
+        return "Hello " + name;
+    }
+
 }

extension-spring/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingGetControllerAlt.java

@@ -66,4 +66,11 @@ public ResponseEntity helloPathVariableWithResponse(@PathVariable(name = "name")
     public ResponseEntity<Greeting> helloPathVariableWithResponseTyped(@PathVariable(name = "name") String name) {
         return ResponseEntity.ok(new Greeting("Hello " + name));
     }
+
+    // 7) Test override of produces
+    @RequestMapping(value = "/overrideProduces/{name}", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE)
+    public String overrideProduces(@PathVariable(name = "name") String name) {
+        return "Hello " + name;
+    }
+
 }

extension-spring/src/test/java/test/io/smallrye/openapi/runtime/scanner/resources/GreetingGetControllerAlt2.java

@@ -66,4 +66,11 @@ public ResponseEntity helloPathVariableWithResponse(@PathVariable(name = "name")
     public ResponseEntity<Greeting> helloPathVariableWithResponseTyped(@PathVariable(name = "name") String name) {
         return ResponseEntity.ok(new Greeting("Hello " + name));
     }
+
+    // 7) Test override of produces
+    @RequestMapping(path = "/overrideProduces/{name}", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE)
+    public String overrideProduces(@PathVariable(name = "name") String name) {
+        return "Hello " + name;
+    }
+
 }

extension-spring/src/test/resources/io/smallrye/openapi/runtime/scanner/resource.testBasicSpringGetDefinitionScanning.json

@@ -146,6 +146,31 @@
           }
         }
       }
+    },
+    "/greeting/overrideProduces/{name}" : {
+      "get" : {
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "OK",
+            "content" : {
+              "text/plain" : {
+                "schema" : {
+                  "type" : "string"
+                }
+              }
+            }
+          }
+        }
+      }
+
     }
   },
   "components" : {