All request headers marked as required for Java controllers in mixed …

…projects in 2.0.3. fixes #2187
springdoc · Apr 1, 2023 · 9e3101b · 9e3101b
1 parent bd08fb3
commit 9e3101b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/...ter-common/src/main/java/org/springdoc/core/configuration/SpringDocKotlinConfiguration.kt b/...ter-common/src/main/java/org/springdoc/core/configuration/SpringDocKotlinConfiguration.kt
@@ -84,7 +84,7 @@ open class SpringDocKotlinConfiguration(objectMapperProvider: ObjectMapperProvid
 	open fun nullableKotlinRequestParameterCustomizer(): ParameterCustomizer {
 		return ParameterCustomizer { parameterModel, methodParameter ->
 			if (parameterModel == null) return@ParameterCustomizer null
-			if (KotlinDetector.isKotlinReflectPresent()) {
+			if (KotlinDetector.isKotlinReflectPresent() && KotlinDetector.isKotlinType(methodParameter.parameterType)) {
 				val kParameter = methodParameter.toKParameter()
 				if (kParameter != null) {
 					val parameterDoc = AnnotatedElementUtils.findMergedAnnotation(
@@ -99,7 +99,7 @@ open class SpringDocKotlinConfiguration(objectMapperProvider: ObjectMapperProvid
 					if (parameterDoc != null && parameterDoc.required)
 						parameterModel.required = parameterDoc.required
 					// parameter is not required if a default value is provided in @RequestParam
-					else if (requestParam != null && ((requestParam.defaultValue != ValueConstants.DEFAULT_NONE) || !requestParam.required))
+					else if (requestParam != null && requestParam.defaultValue != ValueConstants.DEFAULT_NONE)
 						parameterModel.required = false
 					else
 						parameterModel.required =

diff --git a/...gdoc-openapi-kotlin-tests/src/test/java/test/org/springdoc/api/app21/HelloController.java b/...gdoc-openapi-kotlin-tests/src/test/java/test/org/springdoc/api/app21/HelloController.java
@@ -5,6 +5,7 @@
 
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,4 +18,8 @@ public class HelloController {
 	@GetMapping("/")
 	public void greet(@RequestParam(required = false) @Parameter(required = false) final String name) {
 	}
+
+	@GetMapping("/test2")
+	public void greet1(@RequestHeader(required = false) @Parameter(required = false) final String name) {
+	}
 }
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-tests/src/test/resources/results/app21.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-tests/src/test/resources/results/app21.json
@@ -11,6 +11,29 @@
     }
   ],
   "paths": {
+    "/api/v2/test/test2": {
+      "get": {
+        "tags": [
+          "Test"
+        ],
+        "operationId": "greet1",
+        "parameters": [
+          {
+            "name": "name",
+            "in": "header",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
     "/api/v2/test/": {
       "get": {
         "tags": [