merge done

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/core/GenericResponseService.java

@@ -52,6 +52,7 @@
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
@@ -152,7 +153,7 @@ public void buildGenericResponse(Components components, Map<String, Object> find
 			if (org.springframework.aop.support.AopUtils.isAopProxy(controllerAdvice))
 				objClz = org.springframework.aop.support.AopUtils.getTargetClass(controllerAdvice);
 			ControllerAdviceInfo controllerAdviceInfo = new ControllerAdviceInfo(controllerAdvice);
-			Arrays.stream(objClz.getDeclaredMethods()).filter(m -> m.isAnnotationPresent(ExceptionHandler.class)).forEach(methods::add);
+			Arrays.stream(ReflectionUtils.getAllDeclaredMethods(objClz)).filter(m -> m.isAnnotationPresent(ExceptionHandler.class)).forEach(methods::add);
 			// for each one build ApiResponse and add it to existing responses
 			for (Method method : methods) {
 				if (!operationService.isHidden(method)) {

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app158/CommonFooErrorHandler.java

@@ -0,0 +1,14 @@
+package test.org.springdoc.api.app157;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+public class CommonFooErrorHandler {
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.CONFLICT)
+    public ErrorDTO onException(Exception e) {
+        return new ErrorDTO("Something wrong has happened");
+    }
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app158/ErrorDTO.java

@@ -0,0 +1,20 @@
+package test.org.springdoc.api.app157;
+
+public class ErrorDTO {
+    private String message;
+
+    public ErrorDTO() {
+    }
+
+    public ErrorDTO(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

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

@@ -0,0 +1,44 @@
+/*
+ *
+ *  * 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.app157;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Put Foo and Bar in the schema's components, make sure there is an ignored wrapper
+ * ({@code ResponseEntity}).
+ */
+@RestController
+public class HelloController {
+
+	@GetMapping( "/foo")
+	public ResponseEntity<Foo> getFoo() {
+		return new ResponseEntity<Foo>(HttpStatus.OK);
+	}
+
+	@GetMapping( "/bar")
+	public ResponseEntity<Bar> getBar() {
+		return new ResponseEntity<Bar>(HttpStatus.OK);
+	}
+
+
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app158/SimpleDTO.java

@@ -0,0 +1,22 @@
+package test.org.springdoc.api.app157;
+
+public class SimpleDTO {
+
+	private String payload;
+
+	public SimpleDTO() {
+	}
+
+	public SimpleDTO(String payload) {
+		this.payload = payload;
+	}
+
+	public String getPayload() {
+		return payload;
+	}
+
+	public void setPayload(String payload) {
+		this.payload = payload;
+	}
+
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app158/SpecificFooErrorHandler.java

@@ -0,0 +1,7 @@
+package test.org.springdoc.api.app157;
+
+import org.springframework.web.bind.annotation.ControllerAdvice;
+
+@ControllerAdvice(assignableTypes = HelloController.class)
+public class SpecificFooErrorHandler extends CommonFooErrorHandler {
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app158/SpringDocApp158Test.java

@@ -0,0 +1,62 @@
+package test.org.springdoc.api.app158;
+
+import java.util.List;
+
+import io.swagger.v3.core.converter.ModelConverters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springdoc.core.Constants;
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * This test is to make sure that a new model converter can access the parent of a type, even if
+ * the type is enclosed in an ignored wrapper.  We test this by setting up a model converter which
+ * adds "stringy" to the "required" property of a schema's parent, when the sub schema is a String.
+ */
+public class SpringDocApp157Test extends AbstractSpringDocTest {
+
+  @SpringBootApplication
+  static class SpringBootApp {}
+
+  private StringyConverter myConverter = new StringyConverter();
+  private ModelConverters converters = ModelConverters.getInstance();
+
+  @BeforeEach
+  public void registerConverter() {
+    converters.addConverter(myConverter);
+  }
+
+  @AfterEach
+  public void unregisterConverter() {
+    converters.removeConverter(myConverter);
+  }
+
+  @Test
+  public void testApp() throws Exception {
+    mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL))
+        .andExpect(status().isOk())
+        .andExpect(jsonPath("$.openapi", is("3.0.1")))
+        .andExpect(jsonPath("$.components.schemas.Foo.required", is(List.of("stringy"))))
+        .andExpect(jsonPath("$.components.schemas.Bar", not(hasProperty("required"))));
+  }
+=======
+import SpringBootApplication;
+import AbstractSpringDocTest;
+
+public class SpringDocApp157Test extends AbstractSpringDocTest {
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+
+>>>>>>> 5537e88ef7529cc8bca8d4f85a36cfab6b6b5b86
+}

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

@@ -0,0 +1,70 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "API Examples",
+    "version": "1.0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "tags": [
+    {
+      "name": "Operations"
+    }
+  ],
+  "paths": {
+    "/api/foo": {
+      "get": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "hello",
+        "responses": {
+          "409": {
+            "description": "Conflict",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "$ref": "#/components/schemas/ErrorDTO"
+                }
+              }
+            }
+          },
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "$ref": "#/components/schemas/SimpleDTO"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "ErrorDTO": {
+        "type": "object",
+        "properties": {
+          "message": {
+            "type": "string"
+          }
+        }
+      },
+      "SimpleDTO": {
+        "type": "object",
+        "properties": {
+          "payload": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}