root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Polish CompositeHandlerExceptionResolver 

See gh-31495
This commit is contained in:
Phillip Webb 2022-06-22 16:13:03 -07:00
parent 3592292e4b
commit aed4c47adb
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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