code review

Author: bnasslahsen

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

@@ -435,7 +435,7 @@ public GroupedOpenApi build() {
 	 *
 	 * @param openApiCustomiser the open api customiser
 	 */
-	public void addOpenApiCustomiser(OpenApiCustomiser openApiCustomiser) {
+	public void addOpenApiCustomizer(OpenApiCustomiser openApiCustomiser) {
 		this.openApiCustomisers.add(openApiCustomiser);
 	}
 }

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

@@ -357,8 +357,8 @@ OpenApiCustomiser propertiesResolverForSchema(PropertyResolverUtils propertyReso
 	@Conditional(CacheOrGroupedOpenApiCondition.class)
 	@ConditionalOnClass(name = BINDRESULT_CLASS)
 	@Lazy(false)
-	static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor(List<GroupedOpenApi> groupedOpenApis) {
-		return new SpringdocBeanFactoryConfigurer(groupedOpenApis);
+	static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor() {
+		return new SpringdocBeanFactoryConfigurer();
 	}
 
 	/**

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

@@ -47,13 +47,18 @@
  */
 public class SpringdocActuatorBeanFactoryConfigurer extends SpringdocBeanFactoryConfigurer{
 
+	/**
+	 * The Grouped open apis.
+	 */
+	private List<GroupedOpenApi> groupedOpenApis;
+
 	/**
 	 * Instantiates a new Springdoc actuator bean factory configurer.
 	 *
 	 * @param groupedOpenApis the grouped open apis
 	 */
 	public SpringdocActuatorBeanFactoryConfigurer(List<GroupedOpenApi> groupedOpenApis) {
-		super(groupedOpenApis);
+		this.groupedOpenApis = groupedOpenApis;
 	}
 
 	@Override

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

@@ -27,7 +27,6 @@
 import java.util.stream.Collectors;
 
 import io.swagger.v3.oas.models.OpenAPI;
-import org.springdoc.core.customizers.OpenApiCustomiser;
 
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -53,20 +52,6 @@ public class SpringdocBeanFactoryConfigurer implements EnvironmentAware, BeanFac
 	@Nullable
 	protected Environment environment;
 
-	/**
-	 * The Grouped open apis.
-	 */
-	protected List<GroupedOpenApi> groupedOpenApis;
-
-	/**
-	 * Instantiates a new Springdoc bean factory configurer.
-	 *
-	 * @param groupedOpenApis the grouped open apis
-	 */
-	public SpringdocBeanFactoryConfigurer(List<GroupedOpenApi> groupedOpenApis) {
-		this.groupedOpenApis = groupedOpenApis;
-	}
-
 	@Override
 	public void setEnvironment(Environment environment) {
 		this.environment = environment;
@@ -78,7 +63,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 				.bind(SPRINGDOC_PREFIX, SpringDocConfigProperties.class);
 		if (result.isBound()) {
 			SpringDocConfigProperties springDocGroupConfig = result.get();
-			List<GroupedOpenApi> groupedOpenApisList = springDocGroupConfig.getGroupConfigs().stream()
+			List<GroupedOpenApi> groupedOpenApis = springDocGroupConfig.getGroupConfigs().stream()
 					.map(elt -> {
 						GroupedOpenApi.Builder builder = GroupedOpenApi.builder();
 						if (!CollectionUtils.isEmpty(elt.getPackagesToScan()))
@@ -88,13 +73,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 						return builder.group(elt.getGroup()).build();
 					})
 					.collect(Collectors.toList());
-			groupedOpenApisList.forEach(elt -> beanFactory.registerSingleton(elt.getGroup(), elt));
-			this.groupedOpenApis.addAll(groupedOpenApisList);
-
-			if (springDocGroupConfig.getApiDocs().isResolveSchemaProperties()) {
-				OpenApiCustomiser propertiesResolverForSchemaCustomizer = (OpenApiCustomiser) beanFactory.getBean("propertiesResolverForSchema");
-				this.groupedOpenApis.forEach(groupedOpenApi -> groupedOpenApi.addOpenApiCustomiser(propertiesResolverForSchemaCustomizer));
-			}
+			groupedOpenApis.forEach(elt -> beanFactory.registerSingleton(elt.getGroup(), elt));
 		}
 		initBeanFactoryPostProcessor(beanFactory);
 	}
@@ -110,4 +89,5 @@ public static void initBeanFactoryPostProcessor(ConfigurableListableBeanFactory
 		for (String beanName : beanFactory.getBeanNamesForType(OpenAPI.class))
 			beanFactory.getBeanDefinition(beanName).setScope(SCOPE_PROTOTYPE);
 	}
+
 }

springdoc-openapi-webflux-core/src/main/java/org/springdoc/webflux/api/MultipleOpenApiResource.java

@@ -34,17 +34,21 @@
 import org.springdoc.core.SpringDocConfigProperties;
 import org.springdoc.core.SpringDocConfigProperties.GroupConfig;
 import org.springdoc.core.SpringDocProviders;
+import org.springdoc.core.customizers.OpenApiCustomiser;
 
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 
 import static org.springdoc.core.Constants.ACTUATOR_DEFAULT_GROUP;
 
 /**
  * The type Multiple open api resource.
  * @author bnasslahsen
  */
-public abstract class MultipleOpenApiResource implements InitializingBean {
+public abstract class MultipleOpenApiResource implements InitializingBean, ApplicationContextAware {
 
 	/**
 	 * The Grouped open apis.
@@ -86,6 +90,11 @@ public abstract class MultipleOpenApiResource implements InitializingBean {
 	 */
 	private final SpringDocProviders springDocProviders;
 
+	/**
+	 * The Application context.
+	 */
+	protected ApplicationContext applicationContext;
+
 
 	/**
 	 * Instantiates a new Multiple open api resource.
@@ -96,6 +105,7 @@ public abstract class MultipleOpenApiResource implements InitializingBean {
 	 * @param responseBuilder the response builder
 	 * @param operationParser the operation parser
 	 * @param springDocConfigProperties the spring doc config properties
+	 * @param springDocProviders the spring doc providers
 	 */
 	protected MultipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
 			ObjectFactory<OpenAPIService> defaultOpenAPIBuilder, AbstractRequestService requestBuilder,
@@ -113,6 +123,10 @@ protected MultipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
 
 	@Override
 	public void afterPropertiesSet() {
+		if (springDocConfigProperties.getApiDocs().isResolveSchemaProperties()) {
+			OpenApiCustomiser propertiesResolverForSchemaCustomizer = (OpenApiCustomiser) applicationContext.getBean("propertiesResolverForSchema");
+			this.groupedOpenApis.forEach(groupedOpenApi -> groupedOpenApi.addOpenApiCustomizer(propertiesResolverForSchemaCustomizer));
+		}
 		this.groupedOpenApiResources = groupedOpenApis.stream()
 				.collect(Collectors.toMap(GroupedOpenApi::getGroup, item ->
 						{
@@ -168,4 +182,9 @@ protected OpenApiResource getOpenApiResourceOrThrow(String group) {
 		}
 		return openApiResource;
 	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		this.applicationContext = applicationContext;
+	}
 }

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiResource.java

@@ -34,17 +34,21 @@
 import org.springdoc.core.SpringDocConfigProperties;
 import org.springdoc.core.SpringDocConfigProperties.GroupConfig;
 import org.springdoc.core.SpringDocProviders;
+import org.springdoc.core.customizers.OpenApiCustomiser;
 
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 
 import static org.springdoc.core.Constants.ACTUATOR_DEFAULT_GROUP;
 
 /**
  * The type Web mvc multiple open api resource.
  * @author bnasslahsen
  */
-public abstract class MultipleOpenApiResource implements InitializingBean {
+public abstract class MultipleOpenApiResource implements InitializingBean, ApplicationContextAware {
 
 	/**
 	 * The Grouped open apis.
@@ -86,6 +90,11 @@ public abstract class MultipleOpenApiResource implements InitializingBean {
 	 */
 	private Map<String, OpenApiResource> groupedOpenApiResources;
 
+	/**
+	 * The Application context.
+	 */
+	protected ApplicationContext applicationContext;
+
 	/**
 	 * Instantiates a new Multiple open api resource.
 	 *
@@ -95,6 +104,7 @@ public abstract class MultipleOpenApiResource implements InitializingBean {
 	 * @param responseBuilder the response builder
 	 * @param operationParser the operation parser
 	 * @param springDocConfigProperties the spring doc config properties
+	 * @param springDocProviders the spring doc providers
 	 */
 	public MultipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
 			ObjectFactory<OpenAPIService> defaultOpenAPIBuilder, AbstractRequestService requestBuilder,
@@ -112,6 +122,10 @@ public MultipleOpenApiResource(List<GroupedOpenApi> groupedOpenApis,
 
 	@Override
 	public void afterPropertiesSet()  {
+		if (springDocConfigProperties.getApiDocs().isResolveSchemaProperties()) {
+			OpenApiCustomiser propertiesResolverForSchemaCustomizer = (OpenApiCustomiser) applicationContext.getBean("propertiesResolverForSchema");
+			this.groupedOpenApis.forEach(groupedOpenApi -> groupedOpenApi.addOpenApiCustomizer(propertiesResolverForSchemaCustomizer));
+		}
 		this.groupedOpenApiResources = groupedOpenApis.stream()
 				.collect(Collectors.toMap(GroupedOpenApi::getGroup, item ->
 						{
@@ -168,4 +182,9 @@ protected OpenApiResource getOpenApiResourceOrThrow(String group) {
 		}
 		return openApiResource;
 	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		this.applicationContext = applicationContext;
+	}
 }