merge review

Author: bnasslahsen

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

@@ -68,6 +68,7 @@
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.PathItem.HttpMethod;
 import io.swagger.v3.oas.models.Paths;
+import io.swagger.v3.oas.models.SpecVersion;
 import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.responses.ApiResponses;
@@ -340,8 +341,10 @@ protected OpenAPI getOpenApi(Locale locale) {
 						.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a1, a2) -> a1));
 
 				Map<String, Object> findControllerAdvice = openAPIService.getControllerAdviceMap();
-				if (OpenApiVersion.OPENAPI_3_1 == springDocConfigProperties.getApiDocs().getVersion())
+				if (OpenApiVersion.OPENAPI_3_1 == springDocConfigProperties.getApiDocs().getVersion()){
 					openAPI.openapi(OpenApiVersion.OPENAPI_3_1.getVersion());
+					openAPI.specVersion(SpecVersion.V31);
+				}
 				if (springDocConfigProperties.isDefaultOverrideWithGenericResponse()) {
 					if (!CollectionUtils.isEmpty(mappingsMap))
 						findControllerAdvice.putAll(mappingsMap);

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocConfiguration.java

@@ -74,7 +74,6 @@
 import org.springdoc.core.models.GroupedOpenApi;
 import org.springdoc.core.parsers.ReturnTypeParser;
 import org.springdoc.core.properties.SpringDocConfigProperties;
-import org.springdoc.core.properties.SpringDocConfigProperties.ApiDocs.OpenApiVersion;
 import org.springdoc.core.providers.ActuatorProvider;
 import org.springdoc.core.providers.CloudFunctionProvider;
 import org.springdoc.core.providers.JavadocProvider;
@@ -293,14 +292,14 @@ OpenAPIService openAPIBuilder(Optional<OpenAPI> openAPI,
 	/**
 	 * Model converter registrar model converter registrar.
 	 *
-	 * @param modelConverters the model converters
+	 * @param modelConverters           the model converters
+	 * @param springDocConfigProperties the spring doc config properties
 	 * @return the model converter registrar
 	 */
 	@Bean
 	@Lazy(false)
 	ModelConverterRegistrar modelConverterRegistrar(Optional<List<ModelConverter>> modelConverters, SpringDocConfigProperties springDocConfigProperties) {
-		boolean openapi31 = OpenApiVersion.OPENAPI_3_1 == springDocConfigProperties.getApiDocs().getVersion();
-		return new ModelConverterRegistrar(modelConverters.orElse(Collections.emptyList()), openapi31);
+		return new ModelConverterRegistrar(modelConverters.orElse(Collections.emptyList()), springDocConfigProperties);
 	}
 
 	/**
@@ -458,27 +457,29 @@ static class SpringDocActuatorConfiguration {
 		/**
 		 * Springdoc bean factory post processor 3 bean factory post processor.
 		 *
-		 * @param groupedOpenApis the grouped open apis
+		 * @param groupedOpenApis           the grouped open apis
+		 * @param springDocConfigProperties the spring doc config properties
 		 * @return the bean factory post processor
 		 */
 		@Bean
 		@Lazy(false)
 		@ConditionalOnManagementPort(ManagementPortType.DIFFERENT)
 		@Conditional(MultipleOpenApiSupportCondition.class)
-		static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor3(List<GroupedOpenApi> groupedOpenApis) {
-			return new SpringdocActuatorBeanFactoryConfigurer(groupedOpenApis);
+		static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor3(List<GroupedOpenApi> groupedOpenApis, SpringDocConfigProperties springDocConfigProperties) {
+			return new SpringdocActuatorBeanFactoryConfigurer(groupedOpenApis, springDocConfigProperties);
 		}
 
 		/**
 		 * Actuator customizer operation customizer.
 		 *
+		 * @param springDocConfigProperties the spring doc config properties
 		 * @return the operation customizer
 		 */
 		@Bean
 		@Lazy(false)
 		@ConditionalOnManagementPort(ManagementPortType.SAME)
-		GlobalOperationCustomizer actuatorCustomizer() {
-			return new ActuatorOperationCustomizer();
+		GlobalOperationCustomizer actuatorCustomizer(SpringDocConfigProperties springDocConfigProperties) {
+			return new ActuatorOperationCustomizer(springDocConfigProperties);
 		}
 
 		/**
@@ -633,17 +634,18 @@ static class QuerydslProvider {
 		/**
 		 * Query dsl querydsl predicate operation customizer querydsl predicate operation customizer.
 		 *
-		 * @param querydslBindingsFactory the querydsl bindings factory
+		 * @param querydslBindingsFactory   the querydsl bindings factory
+		 * @param springDocConfigProperties the spring doc config properties
 		 * @return the querydsl predicate operation customizer
 		 */
 		@Bean
 		@ConditionalOnMissingBean
 		@Lazy(false)
-		QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory, SpringDocConfigProperties springDocConfigProperties) {
+		QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory,
+				SpringDocConfigProperties springDocConfigProperties) {
 			if (querydslBindingsFactory.isPresent()) {
 				getConfig().addRequestWrapperToIgnore(Predicate.class);
-				boolean openapi31 = OpenApiVersion.OPENAPI_3_1 == springDocConfigProperties.getApiDocs().getVersion();
-				return new QuerydslPredicateOperationCustomizer(querydslBindingsFactory.get(), openapi31);
+				return new QuerydslPredicateOperationCustomizer(querydslBindingsFactory.get(), springDocConfigProperties);
 			}
 			return null;
 		}

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocDataRestConfiguration.java

@@ -36,7 +36,6 @@
 import org.springdoc.core.data.DataRestTagsService;
 import org.springdoc.core.discoverer.SpringDocParameterNameDiscoverer;
 import org.springdoc.core.properties.SpringDocConfigProperties;
-import org.springdoc.core.properties.SpringDocConfigProperties.ApiDocs.OpenApiVersion;
 import org.springdoc.core.providers.DataRestHalProvider;
 import org.springdoc.core.providers.ObjectMapperProvider;
 import org.springdoc.core.providers.SpringRepositoryRestResourceProvider;
@@ -233,9 +232,8 @@ DataRestTagsService dataRestTagsBuilder(OpenAPIService openAPIService) {
 		@Bean
 		@ConditionalOnMissingBean
 		@Lazy(false)
-		SpringDocDataRestUtils springDocDataRestUtils(LinkRelationProvider linkRelationProvider, RepositoryRestConfiguration repositoryRestConfiguration, SpringDocConfigProperties springDocConfigProperties) {
-			boolean openapi31 = OpenApiVersion.OPENAPI_3_1 == springDocConfigProperties.getApiDocs().getVersion();
-			return new SpringDocDataRestUtils(linkRelationProvider, repositoryRestConfiguration, openapi31);
+		SpringDocDataRestUtils springDocDataRestUtils(LinkRelationProvider linkRelationProvider, RepositoryRestConfiguration repositoryRestConfiguration) {
+			return new SpringDocDataRestUtils(linkRelationProvider, repositoryRestConfiguration);
 		}
 	}