Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java

@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.aop.framework.autoproxy.AutoProxyUtils;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -82,20 +82,14 @@ import org.springframework.web.util.HtmlUtils;
 @EnableConfigurationProperties(ResourceProperties.class)
 public class ErrorMvcAutoConfiguration {
 
-	private final ApplicationContext applicationContext;
-
 	private final ServerProperties serverProperties;
 
-	private final ResourceProperties resourceProperties;
+	private final List<ErrorViewResolver> errorViewResolvers;
-
-	@Autowired(required = false)
-	private List<ErrorViewResolver> errorViewResolvers;
 
-	public ErrorMvcAutoConfiguration(ApplicationContext applicationContext,
+	public ErrorMvcAutoConfiguration(ServerProperties serverProperties,
-			ServerProperties serverProperties, ResourceProperties resourceProperties) {
+			ObjectProvider<List<ErrorViewResolver>> errorViewResolversProvider) {
-		this.applicationContext = applicationContext;
 		this.serverProperties = serverProperties;
-		this.resourceProperties = resourceProperties;
+		this.errorViewResolvers = errorViewResolversProvider.getIfAvailable();
 	}
 
 	@Bean
@@ -116,6 +110,24 @@ public class ErrorMvcAutoConfiguration {
 		return new ErrorPageCustomizer(this.serverProperties);
 	}
 
+	@Bean
+	public static PreserveErrorControllerTargetClassPostProcessor preserveErrorControllerTargetClassPostProcessor() {
+		return new PreserveErrorControllerTargetClassPostProcessor();
+	}
+
+	@Configuration
+	static class DefaultErrorViewResolverConfiguration {
+
+		private final ApplicationContext applicationContext;
+
+		private final ResourceProperties resourceProperties;
+
+		DefaultErrorViewResolverConfiguration(ApplicationContext applicationContext,
+				ResourceProperties resourceProperties) {
+			this.applicationContext = applicationContext;
+			this.resourceProperties = resourceProperties;
+		}
+
 		@Bean
 		@ConditionalOnBean(DispatcherServlet.class)
 		@ConditionalOnMissingBean
@@ -124,9 +136,6 @@ public class ErrorMvcAutoConfiguration {
 					this.resourceProperties);
 		}
 
-	@Bean
-	public static PreserveErrorControllerTargetClassPostProcessor preserveErrorControllerTargetClassPostProcessor() {
-		return new PreserveErrorControllerTargetClassPostProcessor();
 	}
 
 	@Configuration