Spring-boot 1, warning about bean creation - cache disabled. Fixes #689

Author: bnasslahsen

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

@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.swagger.v3.core.converter.ModelConverter;
@@ -45,28 +44,21 @@
 
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.context.properties.bind.BindResult;
-import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.context.ApplicationContext;
 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;
 
 import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
-import static org.springdoc.core.Constants.SPRINGDOC_PREFIX;
 import static org.springdoc.core.Constants.SPRINGDOC_SCHEMA_RESOLVE_PROPERTIES;
 import static org.springdoc.core.SpringDocUtils.getConfig;
-import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE;
 
 @Configuration
 @ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
@@ -192,41 +184,17 @@ OpenApiCustomiser propertiesResolverForSchema(PropertyResolverUtils propertyReso
 	@Conditional(CacheOrGroupedOpenApiCondition.class)
 	@ConditionalOnClass(name = BINDRESULT_CLASS)
 	@Lazy(false)
-	BeanFactoryPostProcessor springdocBeanFactoryPostProcessor(Environment environment) {
-		return beanFactory -> {
-			final BindResult<SpringDocConfigProperties> result = Binder.get(environment)
-					.bind(SPRINGDOC_PREFIX, SpringDocConfigProperties.class);
-			if (result.isBound()) {
-				SpringDocConfigProperties springDocGroupConfig = result.get();
-				List<GroupedOpenApi> groupedOpenApis = springDocGroupConfig.getGroupConfigs().stream()
-						.map(elt -> {
-							GroupedOpenApi.Builder builder = GroupedOpenApi.builder();
-							if (!CollectionUtils.isEmpty(elt.getPackagesToScan()))
-								builder.packagesToScan(elt.getPackagesToScan().toArray(new String[0]));
-							if (!CollectionUtils.isEmpty(elt.getPathsToMatch()))
-								builder.pathsToMatch(elt.getPathsToMatch().toArray(new String[0]));
-							return builder.setGroup(elt.getGroup()).build();
-						})
-						.collect(Collectors.toList());
-				groupedOpenApis.forEach(elt -> beanFactory.registerSingleton(elt.getGroup(), elt));
-			}
-			initBeanFactoryPostProcessor(beanFactory);
-		};
+	static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor() {
+		return new SpringdocBeanFactoryConfigurer();
 	}
 
 	// For spring-boot-1 compatibility
 	@Bean
 	@Conditional(CacheOrGroupedOpenApiCondition.class)
 	@ConditionalOnMissingClass(value = BINDRESULT_CLASS)
 	@Lazy(false)
-	BeanFactoryPostProcessor springdocBeanFactoryPostProcessor2(Environment environment) {
-		return this::initBeanFactoryPostProcessor;
+	static BeanFactoryPostProcessor springdocBeanFactoryPostProcessor2() {
+		return beanFactory -> SpringdocBeanFactoryConfigurer.initBeanFactoryPostProcessor(beanFactory);
 	}
 
-	private void initBeanFactoryPostProcessor(ConfigurableListableBeanFactory beanFactory) {
-		for (String beanName : beanFactory.getBeanNamesForType(OpenAPIBuilder.class))
-			beanFactory.getBeanDefinition(beanName).setScope(SCOPE_PROTOTYPE);
-		for (String beanName : beanFactory.getBeanNamesForType(OpenAPI.class))
-			beanFactory.getBeanDefinition(beanName).setScope(SCOPE_PROTOTYPE);
-	}
 }

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

@@ -0,0 +1,81 @@
+/*
+ *
+ *  *
+ *  *  *
+ *  *  *  * 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 org.springdoc.core;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import io.swagger.v3.oas.models.OpenAPI;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.boot.context.properties.bind.BindResult;
+import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.core.env.Environment;
+import org.springframework.lang.Nullable;
+import org.springframework.util.CollectionUtils;
+
+import static org.springdoc.core.Constants.SPRINGDOC_PREFIX;
+import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE;
+
+public class SpringdocBeanFactoryConfigurer implements EnvironmentAware, BeanFactoryPostProcessor {
+
+	@Nullable
+	private Environment environment;
+
+	@Override
+	public void setEnvironment(Environment environment) {
+		this.environment = environment;
+	}
+
+	@Override
+	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
+		final BindResult<SpringDocConfigProperties> result = Binder.get(environment)
+				.bind(SPRINGDOC_PREFIX, SpringDocConfigProperties.class);
+		if (result.isBound()) {
+			SpringDocConfigProperties springDocGroupConfig = result.get();
+			List<GroupedOpenApi> groupedOpenApis = springDocGroupConfig.getGroupConfigs().stream()
+					.map(elt -> {
+						GroupedOpenApi.Builder builder = GroupedOpenApi.builder();
+						if (!CollectionUtils.isEmpty(elt.getPackagesToScan()))
+							builder.packagesToScan(elt.getPackagesToScan().toArray(new String[0]));
+						if (!CollectionUtils.isEmpty(elt.getPathsToMatch()))
+							builder.pathsToMatch(elt.getPathsToMatch().toArray(new String[0]));
+						return builder.setGroup(elt.getGroup()).build();
+					})
+					.collect(Collectors.toList());
+			groupedOpenApis.forEach(elt -> beanFactory.registerSingleton(elt.getGroup(), elt));
+		}
+		initBeanFactoryPostProcessor(beanFactory);
+	}
+
+	public static void initBeanFactoryPostProcessor(ConfigurableListableBeanFactory beanFactory) {
+		for (String beanName : beanFactory.getBeanNamesForType(OpenAPIBuilder.class))
+			beanFactory.getBeanDefinition(beanName).setScope(SCOPE_PROTOTYPE);
+		for (String beanName : beanFactory.getBeanNamesForType(OpenAPI.class))
+			beanFactory.getBeanDefinition(beanName).setScope(SCOPE_PROTOTYPE);
+	}
+}