code review

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

@@ -315,7 +315,7 @@ protected synchronized OpenAPI getOpenApi(Locale locale) {
 			Map<String, Object> findControllerAdvice = openAPIService.getControllerAdviceMap();
 			// calculate generic responses
 			openApi = openAPIService.getCalculatedOpenAPI();
-			if (springDocConfigProperties.isOverrideWithGenericResponse() || springDocConfigProperties.isOverrideWithGenericResponseIfDeclared()) {
+			if (springDocConfigProperties.isDefaultOverrideWithGenericResponse()) {
 				if (!CollectionUtils.isEmpty(mappingsMap))
 					findControllerAdvice.putAll(mappingsMap);
 				responseBuilder.buildGenericResponse(openApi.getComponents(), findControllerAdvice, finalLocale);

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

@@ -142,7 +142,7 @@ public GenericResponseService(OperationService operationService, List<ReturnType
 	public ApiResponses build(Components components, HandlerMethod handlerMethod, Operation operation,
 			MethodAttributes methodAttributes) {
 		Map<String, ApiResponse> genericMapResponse = getGenericMapResponse(handlerMethod.getBeanType());
-		if (springDocConfigProperties.isOverrideWithGenericResponseIfDeclared()) {
+		if (springDocConfigProperties.isOverrideWithGenericResponse()) {
 			genericMapResponse = filterAndEnrichGenericMapResponseByDeclarations(handlerMethod, genericMapResponse);
 		}
 		ApiResponses apiResponses = methodAttributes.calculateGenericMapResponse(genericMapResponse);
@@ -549,7 +549,7 @@ else if (CollectionUtils.isEmpty(apiResponse.getContent()))
 			if (schemaN != null && ArrayUtils.isNotEmpty(methodAttributes.getMethodProduces()))
 				Arrays.stream(methodAttributes.getMethodProduces()).forEach(mediaTypeStr -> mergeSchema(existingContent, schemaN, mediaTypeStr));
 		}
-		if (springDocConfigProperties.isOverrideWithGenericResponseIfDeclared()
+		if (springDocConfigProperties.isOverrideWithGenericResponse()
 				&& methodParameter.getExecutable().isAnnotationPresent(ExceptionHandler.class)) {
 			// ExceptionHandler's exception class resolution is non-trivial
 			// more info on its javadoc

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

@@ -115,12 +115,7 @@ public class SpringDocConfigProperties {
 	/**
 	 * The Override with generic response.
 	 */
-	private boolean overrideWithGenericResponse = true;
-
-	/**
-	 * The Override with generic response only if the exception is declared
-	 */
-	private boolean overrideWithGenericResponseIfDeclared = false;
+	private Boolean overrideWithGenericResponse;
 
 	/**
 	 * The Remove broken reference definitions.
@@ -584,35 +579,29 @@ public void setDefaultProducesMediaType(String defaultProducesMediaType) {
 	 *
 	 * @return the boolean
 	 */
-	public boolean isOverrideWithGenericResponse() {
-		return overrideWithGenericResponse;
+	public Boolean isOverrideWithGenericResponse() {
+		return overrideWithGenericResponse != null && overrideWithGenericResponse;
 	}
 
 	/**
-	 * Sets override with generic response.
+	 * Gets default override with generic response.
 	 *
-	 * @param overrideWithGenericResponse the override with generic response
+	 * @return the default override with generic response
 	 */
-	public void setOverrideWithGenericResponse(boolean overrideWithGenericResponse) {
-		this.overrideWithGenericResponse = overrideWithGenericResponse;
+	public boolean isDefaultOverrideWithGenericResponse() {
+		if (overrideWithGenericResponse == null)
+			return true;
+		else
+			return overrideWithGenericResponse;
 	}
 
 	/**
-	 * Is override with generic response if declared boolean.
-	 *
-	 * @return the boolean
-	 */
-	public boolean isOverrideWithGenericResponseIfDeclared() {
-		return overrideWithGenericResponseIfDeclared;
-	}
-
-	/**
-	 * Sets override with generic response if declared.
+	 * Sets override with generic response.
 	 *
-	 * @param overrideWithGenericResponseIfDeclared the override with generic response if declared
+	 * @param overrideWithGenericResponse the override with generic response
 	 */
-	public void setOverrideWithGenericResponseIfDeclared(boolean overrideWithGenericResponseIfDeclared) {
-		this.overrideWithGenericResponseIfDeclared = overrideWithGenericResponseIfDeclared;
+	public void setOverrideWithGenericResponse(Boolean overrideWithGenericResponse) {
+		this.overrideWithGenericResponse = overrideWithGenericResponse;
 	}
 
 	/**

springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app162/SpringDocApp162Test.java

@@ -10,7 +10,7 @@
 /**
  * The type Spring doc app 162 test.
  */
-@TestPropertySource(properties = "springdoc.override-with-generic-response-if-declared=true")
+@TestPropertySource(properties = "springdoc.override-with-generic-response=true")
 public class SpringDocApp162Test extends AbstractSpringDocTest {
 
     /**

springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app163/SpringDocApp163Test.java

@@ -2,15 +2,16 @@
 
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
+import test.org.springdoc.api.AbstractSpringDocTest;
+
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.TestPropertySource;
-import test.org.springdoc.api.AbstractSpringDocTest;
 
 /**
  * The type Spring doc app 163 test.
  */
-@TestPropertySource(properties = "springdoc.override-with-generic-response-if-declared=true")
+@TestPropertySource(properties = "springdoc.override-with-generic-response=true")
 public class SpringDocApp163Test extends AbstractSpringDocTest {
 
     /**

springdoc-openapi-javadoc/src/test/java/org/springdoc/openapi/javadoc/SpringDocJavadocProviderTest.java renamed to springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/app164/SpringDocJavadocProviderTest.java

@@ -1,12 +1,13 @@
-package org.springdoc.openapi.javadoc;
+package test.org.springdoc.api.app164;
+
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springdoc.core.providers.JavadocProvider;
-
-import java.util.stream.Stream;
+import org.springdoc.openapi.javadoc.SpringDocJavadocProvider;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.params.provider.Arguments.arguments;