Lazy Initialisation breaks WebFlux support. Fixes #562

Author: bnasslahsen

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

@@ -49,6 +49,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.env.Environment;
 import org.springframework.util.CollectionUtils;
@@ -73,17 +74,20 @@ LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer(
 	}
 
 	@Bean
+	@Lazy(false)
 	AdditionalModelsConverter pageableSupportConverter() {
 		return new AdditionalModelsConverter();
 	}
 
 	@Bean
+	@Lazy(false)
 	PropertyCustomizingConverter propertyCustomizingConverter(Optional<List<PropertyCustomizer>> customizers) {
 		return new PropertyCustomizingConverter(customizers);
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
+	@Lazy(false)
 	ResponseSupportConverter responseSupportConverter() {
 		return new ResponseSupportConverter();
 	}
@@ -98,6 +102,7 @@ OpenAPIBuilder openAPIBuilder(Optional<OpenAPI> openAPI, ApplicationContext cont
 	}
 
 	@Bean
+	@Lazy(false)
 	ModelConverterRegistrar modelConverterRegistrar(Optional<List<ModelConverter>> modelConverters) {
 		return new ModelConverterRegistrar(modelConverters.orElse(Collections.emptyList()));
 	}
@@ -142,6 +147,7 @@ GenericParameterBuilder parameterBuilder(PropertyResolverUtils propertyResolverU
 
 	@Bean
 	@ConditionalOnProperty(SPRINGDOC_SCHEMA_RESOLVE_PROPERTIES)
+	@Lazy(false)
 	OpenApiCustomiser propertiesResolverForSchema(PropertyResolverUtils propertyResolverUtils, OpenAPIBuilder openAPIBuilder) {
 		return openApi -> {
 			Components components = openApi.getComponents();
@@ -152,6 +158,7 @@ OpenApiCustomiser propertiesResolverForSchema(PropertyResolverUtils propertyReso
 
 	@Bean
 	@Conditional(CacheOrGroupedOpenApiCondition.class)
+	@Lazy(false)
 	BeanFactoryPostProcessor springdocBeanFactoryPostProcessor(Environment environment) {
 		return beanFactory -> {
 			final BindResult<SpringDocConfigProperties> result = Binder.get(environment)

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringDocDataRestConfiguration.java

@@ -40,6 +40,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.querydsl.binding.QuerydslBindingsFactory;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.hateoas.Link;
@@ -63,6 +64,7 @@ class QuerydslProvider {
 
 		@Bean
 		@ConditionalOnMissingBean
+		@Lazy(false)
 		QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory) {
 			if (querydslBindingsFactory.isPresent()) {
 				getConfig().addRequestWrapperToIgnore(Predicate.class);
@@ -75,6 +77,7 @@ QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomize
 
 	@Bean
 	@ConditionalOnMissingBean
+	@Lazy(false)
 	HalProvider halProvider(Optional<RepositoryRestConfiguration> repositoryRestConfiguration) {
 		return new HalProvider(repositoryRestConfiguration);
 	}
@@ -86,6 +89,7 @@ HalProvider halProvider(Optional<RepositoryRestConfiguration> repositoryRestConf
 	 * @see org.springframework.hateoas.mediatype.hal.Jackson2HalModule.HalLinkListSerializer#serialize(Links, JsonGenerator, SerializerProvider)
 	 */
 	@Bean
+	@Lazy(false)
 	OpenApiCustomiser linksSchemaCustomiser(Optional<RepositoryRestConfiguration> repositoryRestConfiguration) {
 		if (!repositoryRestConfiguration.isPresent() || !repositoryRestConfiguration.get().useHalAsDefaultJsonMediaType()) {
 			return openApi -> {

springdoc-openapi-groovy/src/main/java/org/springdoc/groovy/SpringDocGroovyConfiguration.java

@@ -25,6 +25,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 
 import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
 
@@ -33,12 +34,14 @@
 public class SpringDocGroovyConfiguration {
 
 	@Bean
+	@Lazy(false)
 	Object ignoreGroovyMetaClass() {
 		SpringDocUtils.getConfig().addRequestWrapperToIgnore(MetaClass.class);
 		return null;
 	}
 
 	@Bean
+	@Lazy(false)
 	RequestTypeToIgnoreConverter requestTypeToIgnoreConverter() {
 		return new RequestTypeToIgnoreConverter();
 	}

springdoc-openapi-kotlin/src/main/java/org/springdoc/kotlin/SpringDocKotlinConfiguration.java

@@ -26,6 +26,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Primary;
 
 import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
@@ -42,7 +43,7 @@ public class SpringDocKotlinConfiguration {
 	}
 
 	@Bean
-	@Primary
+	@Lazy(false)
 	KotlinCoroutinesReturnTypeParser kotlinCoroutinesReturnTypeParser() {
 		return new KotlinCoroutinesReturnTypeParser();
 	}

springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/MultipleOpenApiWebFluxConfiguration.java

@@ -36,6 +36,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping;
 
 import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
@@ -49,6 +50,7 @@ public class MultipleOpenApiWebFluxConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
+	@Lazy(false)
 	MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
 			ObjectFactory<OpenAPIBuilder> defaultOpenAPIBuilder, AbstractRequestBuilder requestBuilder,
 			GenericResponseBuilder responseBuilder, OperationBuilder operationParser,

springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/core/SpringDocWebFluxConfiguration.java

@@ -41,6 +41,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.web.reactive.result.method.RequestMappingInfoHandlerMapping;
 
@@ -54,6 +55,7 @@ public class SpringDocWebFluxConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
+	@Lazy(false)
 	OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
 			GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
 			RequestMappingInfoHandlerMapping requestMappingHandlerMapping,
@@ -82,6 +84,7 @@ GenericResponseBuilder responseBuilder(OperationBuilder operationBuilder, List<R
 
 	@Bean
 	@ConditionalOnMissingBean
+	@Lazy(false)
 	WebFluxSupportConverter webFluxSupportConverter() {
 		return new WebFluxSupportConverter();
 	}

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/MultipleOpenApiSupportConfiguration.java

@@ -39,6 +39,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
 
 import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
@@ -52,6 +53,7 @@ public class MultipleOpenApiSupportConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
+	@Lazy(false)
 	MultipleOpenApiResource multipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
 			ObjectFactory<OpenAPIBuilder> defaultOpenAPIBuilder, AbstractRequestBuilder requestBuilder,
 			GenericResponseBuilder responseBuilder, OperationBuilder operationParser,

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/core/SpringDocWebMvcConfiguration.java

@@ -45,6 +45,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
@@ -60,6 +61,7 @@ public class SpringDocWebMvcConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
+	@Lazy(false)
 	OpenApiResource openApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
 			GenericResponseBuilder responseBuilder, OperationBuilder operationParser,
 			RequestMappingInfoHandlerMapping requestMappingHandlerMapping,
@@ -100,6 +102,7 @@ ActuatorProvider actuatorProvider(WebMvcEndpointHandlerMapping webMvcEndpointHan
 		}
 
 		@Bean
+		@Lazy(false)
 		OperationCustomizer actuatorCustomizer(ActuatorProvider actuatorProvider) {
 			return new OperationCustomizer() {
 				private int methodCount;