Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistently resolve exceptions for resources and handler functions

Browse Source 
Closes gh-33381
This commit is contained in:
Juergen Hoeller
2024-09-11 15:51:01 +02:00
parent a044357c31
commit e9e5fee149
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java
View File

@@ -22,7 +22,6 @@ import jakarta.servlet.http.HttpServletResponse;
import org.springframework.lang.Nullable;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.function.HandlerFunction;
/**
* Abstract base class for
@@ -30,28 +29,24 @@ import org.springframework.web.servlet.function.HandlerFunction;
* implementations that support handling exceptions from handlers of type {@link HandlerMethod}.
*
* @author Rossen Stoyanchev
* @author Juergen Hoeller
* @since 3.1
*/
public abstract class AbstractHandlerMethodExceptionResolver extends AbstractHandlerExceptionResolver {
/**
* Checks if the handler is a {@link HandlerMethod} or a {@link HandlerFunction}
* and then delegates to the base class implementation of {@code #shouldApplyTo(HttpServletRequest, Object)}
* passing the bean of the {@code HandlerMethod}. Otherwise, returns {@code false}.
* Checks if the handler is a {@link HandlerMethod} or the resolver has global exception
* handlers and then delegates to the base class implementation of {@code #shouldApplyTo}
* passing the bean of the {@code HandlerMethod} if necessary. Otherwise, returns {@code false}.
* @see HandlerMethod
* @see #hasGlobalExceptionHandlers()
*/
@Override
protected boolean shouldApplyTo(HttpServletRequest request, @Nullable Object handler) {
if (handler == null) {
return super.shouldApplyTo(request, null);
if (handler instanceof HandlerMethod handlerMethod) {
return super.shouldApplyTo(request, handlerMethod.getBean());
}
else if (handler instanceof HandlerMethod handlerMethod) {
handler = handlerMethod.getBean();
return super.shouldApplyTo(request, handler);
}
else if (handler instanceof HandlerFunction<?> handlerFunction) {
return super.shouldApplyTo(request, handlerFunction);
}
else if (hasGlobalExceptionHandlers() && hasHandlerMappings()) {
else if (handler == null || (hasGlobalExceptionHandlers() && hasHandlerMappings())) {
return super.shouldApplyTo(request, handler);
}
else {

10
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java
View File

@@ -60,6 +60,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
import org.springframework.web.servlet.HandlerMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.function.HandlerFunction;
import org.springframework.web.servlet.handler.AbstractHandlerMethodExceptionResolver;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
@@ -419,8 +420,13 @@ public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExce
@Override
protected boolean shouldApplyTo(HttpServletRequest request, @Nullable Object handler) {
return (handler instanceof ResourceHttpRequestHandler ?
hasGlobalExceptionHandlers() : super.shouldApplyTo(request, handler));
if ((handler instanceof ResourceHttpRequestHandler || handler instanceof HandlerFunction) &&
hasGlobalExceptionHandlers() && !hasHandlerMappings()) {
return true; // apply to ResourceHttpRequestHandler and HandlerFunction by default
}
else {
return super.shouldApplyTo(request, handler);
}
}
/**