@CookieValue parameter indents request body. Fixes #419

Author: bnasslahsen

Diff for: springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractRequestBuilder.java

@@ -60,6 +60,7 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
+import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -258,6 +259,8 @@ private Parameter buildParams(ParameterInfo parameterInfo, Components components
 				RequestParam.class);
 		PathVariable pathVar = parameterBuilder.getParameterAnnotation(handlerMethod, parameters, index,
 				PathVariable.class);
+		CookieValue cookieValue =  parameterBuilder.getParameterAnnotation(handlerMethod, parameters, index,
+				CookieValue.class);
 
 		Parameter parameter = null;
 		RequestInfo requestInfo;
@@ -281,6 +284,10 @@ else if (pathVar != null) {
 			// check if PATH PARAM
 			requestInfo = new RequestInfo(ParameterType.PATH_PARAM, pathVar.value(), Boolean.TRUE, null);
 			parameter = buildParam(parameterInfo, components, requestInfo, jsonView);
+		} else if (cookieValue != null) {
+			requestInfo = new RequestInfo(ParameterType.COOKIE, cookieValue.value(), cookieValue.required(),
+					cookieValue.defaultValue());
+			parameter = buildParam(parameterInfo, components, requestInfo, jsonView);
 		}
 		// By default
 		if (RequestMethod.GET.equals(requestMethod) || (parameterInfo.getParameterModel() != null && ParameterIn.PATH.toString().equals(parameterInfo.getParameterModel().getIn()))) {

Diff for: springdoc-openapi-common/src/main/java/org/springdoc/core/RequestInfo.java

@@ -52,7 +52,7 @@ public String type() {
 	}
 
 	public enum ParameterType {
-		QUERY_PARAM("query"), HEADER_PARAM("header"), PATH_PARAM("path");
+		QUERY_PARAM("query"), HEADER_PARAM("header"), PATH_PARAM("path"), COOKIE("cookie");
 
 		private final String value;
 

Diff for: springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app87/HelloController.java

@@ -0,0 +1,50 @@
+/*
+ *
+ *  * Copyright 2019-2020 the original author or authors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package test.org.springdoc.api.app87;
+
+import java.util.UUID;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController("cookie")
+public class HelloController {
+
+	@PutMapping("/{itemId}")
+	@Operation
+	public ResponseEntity<Item> putItem(
+			@CookieValue(
+					name = "cookie"
+			) String cookie,
+			@PathVariable UUID itemId,
+			@RequestBody Item item
+	) {
+		return ResponseEntity.ok(item);
+	}
+
+	public static class Item {
+	}
+}

Diff for: springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app87/SpringDocApp87Test.java

@@ -0,0 +1,30 @@
+/*
+ *
+ *  * Copyright 2019-2020 the original author or authors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package test.org.springdoc.api.app87;
+
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+public class SpringDocApp87Test extends AbstractSpringDocTest {
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+
+}

Diff for: springdoc-openapi-webmvc-core/src/test/resources/results/app87.json

@@ -0,0 +1,70 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/{itemId}": {
+      "put": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "putItem",
+        "parameters": [
+          {
+            "name": "cookie",
+            "in": "cookie",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "itemId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Item"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "$ref": "#/components/schemas/Item"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "Item": {
+        "type": "object"
+      }
+    }
+  }
+}