Update changelog

Author: bnasslahsen

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Added
 - Added ability to disable security for one operation using  @SecurityRequirements #259
 - Support for extensions on @ApiResponse #368
+- Support for CompletionStage as endpoint return type #370
+- Support for extensions on @ApiResponse #368
+- Support for java 8 Optional for  @RequestParam #375
 
 ## [1.2.28] -
 ## Changed

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app79/HelloController.java

@@ -16,32 +16,8 @@
  *
  */
 
-package test.org.springdoc.api.app78;
+package test.org.springdoc.api.app79;
 
-<<<<<<< HEAD
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class HelloController {
-
-	@RequestMapping(value = "/person1", method = RequestMethod.GET)
-	private CompletionStage<ResponseEntity<PersonDTO>> getPerson1(String str) {
-		return null;
-	}
-
-	@RequestMapping(value = "/person2", method = RequestMethod.GET)
-	private CompletableFuture<PersonDTO> getPerson2(String str) {
-		return null;
-	}
-
-}
-=======
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -58,4 +34,3 @@ public String echo(@RequestParam Optional<String> text) {
 	}
 
 }
->>>>>>> 945f0e9e8cbfe98accf6bb98cc7274552fa47441

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app79/SpringDocApp79Test.java

@@ -23,7 +23,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 
-public class SpringDocApp78Test extends AbstractSpringDocTest {
+public class SpringDocApp79Test extends AbstractSpringDocTest {
 
 	@SpringBootApplication
 	static class SpringDocTestApp {}

springdoc-openapi-webmvc-core/src/test/resources/results/app79.json

@@ -11,30 +11,17 @@
     }
   ],
   "paths": {
-<<<<<<< HEAD
-    "/person1": {
-=======
     "/test": {
->>>>>>> 945f0e9e8cbfe98accf6bb98cc7274552fa47441
       "get": {
         "tags": [
           "hello-controller"
         ],
-<<<<<<< HEAD
-        "operationId": "getPerson1",
-        "parameters": [
-          {
-            "name": "str",
-            "in": "query",
-            "required": true,
-=======
         "operationId": "echo",
         "parameters": [
           {
             "name": "text",
             "in": "query",
             "required": false,
->>>>>>> 945f0e9e8cbfe98accf6bb98cc7274552fa47441
             "schema": {
               "type": "string"
             }
@@ -44,45 +31,9 @@
           "200": {
             "description": "default response",
             "content": {
-<<<<<<< HEAD
-              "*/*": {
-                "schema": {
-                  "$ref": "#/components/schemas/PersonDTO"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/person2": {
-      "get": {
-        "tags": [
-          "hello-controller"
-        ],
-        "operationId": "getPerson2",
-        "parameters": [
-          {
-            "name": "str",
-            "in": "query",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "default response",
-            "content": {
-              "*/*": {
-                "schema": {
-                  "$ref": "#/components/schemas/PersonDTO"
-=======
               "text/plain": {
                 "schema": {
                   "type": "string"
->>>>>>> 945f0e9e8cbfe98accf6bb98cc7274552fa47441
                 }
               }
             }
@@ -91,26 +42,5 @@
       }
     }
   },
-<<<<<<< HEAD
-  "components": {
-    "schemas": {
-      "PersonDTO": {
-        "type": "object",
-        "properties": {
-          "email": {
-            "type": "string"
-          },
-          "firstName": {
-            "type": "string"
-          },
-          "lastName": {
-            "type": "string"
-          }
-        }
-      }
-    }
-  }
-=======
   "components": {}
->>>>>>> 945f0e9e8cbfe98accf6bb98cc7274552fa47441
 }