From 7b46f925d779e7ccafcca2af3ccf7f7618a5689a Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Thu, 4 Jan 2018 14:27:32 +0000
Subject: [PATCH] Switch to SmartInitializingSingleton to avoid early
 instantiation

Use of BeanProcessor to catch a bean before it is used is a bit
agricultural these days. SmartInitializingSingleton is better and
frees application logs from one more annoying INFO log on an
early instantiation

2018-01-04 14:17:05.930  INFO 23472 --- [       Thread-0] trationDelegate$BeanPostProcessorChecker :
  Bean 'org.springframework.cloud.function.web.flux.ReactorAutoConfiguration' of type
  [org.springframework.cloud.function.web.flux.ReactorAutoConfiguration$$EnhancerBySpringCGLIB$$8d4844e]
  is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
---
 .../web/flux/ReactorAutoConfiguration.java    | 47 ++++++++-----------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java
index d5394b1b7..268e92a56 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/ReactorAutoConfiguration.java
@@ -21,9 +21,8 @@ import java.util.List;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -65,7 +64,7 @@ public class ReactorAutoConfiguration {
 	@ConditionalOnMissingClass("org.springframework.core.ReactiveAdapter")
 	protected static class FluxReturnValueConfiguration {
 		@Bean
-		public FluxReturnValueHandler fluxReturnValueHandler(FunctionInspector inspector, 
+		public FluxReturnValueHandler fluxReturnValueHandler(FunctionInspector inspector,
 				HttpMessageConverters converters) {
 			return new FluxReturnValueHandler(inspector, converters.getConverters());
 		}
@@ -81,34 +80,26 @@ public class ReactorAutoConfiguration {
 	}
 
 	@Bean
-	public BeanPostProcessor fluxRequestMappingHandlerAdapterProcessor() {
-		return new BeanPostProcessor() {
-			@Override
-			public Object postProcessAfterInitialization(Object bean, String beanName)
-					throws BeansException {
-				if (bean instanceof RequestMappingHandlerAdapter) {
-					RequestMappingHandlerAdapter adapter = (RequestMappingHandlerAdapter) bean;
-					List<HandlerMethodArgumentResolver> resolvers = new ArrayList<>(
-							adapter.getArgumentResolvers());
-					resolvers.add(0,
-							context.getBean(FluxHandlerMethodArgumentResolver.class));
-					adapter.setArgumentResolvers(resolvers);
-					if (!ClassUtils.isPresent("org.springframework.core.ReactiveAdapter",
-							null)) {
-						List<HandlerMethodReturnValueHandler> handlers = new ArrayList<>(
-								adapter.getReturnValueHandlers());
-						handlers.add(0, context.getBean(FluxReturnValueHandler.class));
-						adapter.setReturnValueHandlers(handlers);
-					}
-				}
-				return bean;
-			}
+	public SmartInitializingSingleton fluxRequestMappingHandlerAdapterProcessor(
+			RequestMappingHandlerAdapter adapter,
+			FluxHandlerMethodArgumentResolver resolver) {
+		return new SmartInitializingSingleton() {
 
 			@Override
-			public Object postProcessBeforeInitialization(Object bean, String beanName)
-					throws BeansException {
-				return bean;
+			public void afterSingletonsInstantiated() {
+				List<HandlerMethodArgumentResolver> resolvers = new ArrayList<>(
+						adapter.getArgumentResolvers());
+				resolvers.add(0, resolver);
+				adapter.setArgumentResolvers(resolvers);
+				if (!ClassUtils.isPresent("org.springframework.core.ReactiveAdapter",
+						null)) {
+					List<HandlerMethodReturnValueHandler> handlers = new ArrayList<>(
+							adapter.getReturnValueHandlers());
+					handlers.add(0, context.getBean(FluxReturnValueHandler.class));
+					adapter.setReturnValueHandlers(handlers);
+				}
 			}
+
 		};
 	}
 }