Polish CompositeHandlerExceptionResolver

See gh-31495

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolver.java

@@ -18,7 +18,6 @@ package org.springframework.boot.actuate.autoconfigure.web.servlet;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -47,36 +46,45 @@ class CompositeHandlerExceptionResolver implements HandlerExceptionResolver {
 	@Autowired
 	private ListableBeanFactory beanFactory;
 
-	private List<HandlerExceptionResolver> resolvers;
+	private transient List<HandlerExceptionResolver> resolvers;
 
 	@Override
 	public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response, Object handler,
 			Exception ex) {
-		if (this.resolvers == null) {
+		for (HandlerExceptionResolver resolver : getResolvers()) {
-			this.resolvers = extractResolvers();
+			ModelAndView resolved = resolver.resolveException(request, response, handler, ex);
+			if (resolved != null) {
+				return resolved;
 			}
-		return this.resolvers.stream().map((resolver) -> resolver.resolveException(request, response, handler, ex))
+		}
-				.filter(Objects::nonNull).findFirst().orElse(null);
+		return null;
 	}
 
-	private List<HandlerExceptionResolver> extractResolvers() {
+	private List<HandlerExceptionResolver> getResolvers() {
-		List<HandlerExceptionResolver> list = new ArrayList<>();
+		List<HandlerExceptionResolver> resolvers = this.resolvers;
-		BeanFactory beanFactory = this.beanFactory;
+		if (resolvers == null) {
-		while (beanFactory != null) {
+			resolvers = new ArrayList<>();
-			if (beanFactory instanceof ListableBeanFactory) {
+			collectResolverBeans(resolvers, this.beanFactory);
-				list.addAll(
+			resolvers.remove(this);
-						((ListableBeanFactory) beanFactory).getBeansOfType(HandlerExceptionResolver.class).values());
+			AnnotationAwareOrderComparator.sort(resolvers);
+			if (resolvers.isEmpty()) {
+				resolvers.add(new DefaultErrorAttributes());
+				resolvers.add(new DefaultHandlerExceptionResolver());
+			}
+			this.resolvers = resolvers;
 		}
-			beanFactory = (beanFactory instanceof HierarchicalBeanFactory)
+		return resolvers;
-					? ((HierarchicalBeanFactory) beanFactory).getParentBeanFactory() : null;
+	}
+
+	private void collectResolverBeans(List<HandlerExceptionResolver> resolvers, BeanFactory beanFactory) {
+		if (beanFactory instanceof ListableBeanFactory) {
+			ListableBeanFactory listableBeanFactory = (ListableBeanFactory) beanFactory;
+			resolvers.addAll(listableBeanFactory.getBeansOfType(HandlerExceptionResolver.class).values());
 		}
-		list.remove(this);
+		if (beanFactory instanceof HierarchicalBeanFactory) {
-		AnnotationAwareOrderComparator.sort(list);
+			HierarchicalBeanFactory hierarchicalBeanFactory = (HierarchicalBeanFactory) beanFactory;
-		if (list.isEmpty()) {
+			collectResolverBeans(resolvers, hierarchicalBeanFactory.getParentBeanFactory());
-			list.add(new DefaultErrorAttributes());
-			list.add(new DefaultHandlerExceptionResolver());
 		}
-		return list;
 	}
 
 }