From 0795ae5c6a20be05668763aa28e99b7c86769b98 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 5 May 2018 16:55:06 +0200 Subject: [PATCH] Polishing --- .../web/servlet/HandlerExceptionResolver.java | 6 +++--- .../handler/AbstractHandlerExceptionResolver.java | 8 ++++---- .../servlet/handler/SimpleMappingExceptionResolver.java | 9 +++++---- .../mvc/annotation/ResponseStatusExceptionResolver.java | 8 ++++---- .../mvc/support/DefaultHandlerExceptionResolver.java | 5 ++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java index f870fe5a20..76ad615e46 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,8 +46,8 @@ public interface HandlerExceptionResolver { * @param handler the executed handler, or {@code null} if none chosen at the * time of the exception (for example, if multipart resolution failed) * @param ex the exception that got thrown during handler execution - * @return a corresponding {@code ModelAndView} to forward to, or {@code null} - * for default processing + * @return a corresponding {@code ModelAndView} to forward to, + * or {@code null} for default processing in the resolution chain */ @Nullable ModelAndView resolveException( diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java index d60a4a4adc..964411c6db 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java @@ -17,7 +17,6 @@ package org.springframework.web.servlet.handler; import java.util.Set; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -241,10 +240,11 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti * @param handler the executed handler, or {@code null} if none chosen at the time * of the exception (for example, if multipart resolution failed) * @param ex the exception that got thrown during handler execution - * @return a corresponding {@code ModelAndView} to forward to, or {@code null} for default processing + * @return a corresponding {@code ModelAndView} to forward to, + * or {@code null} for default processing in the resolution chain */ @Nullable - protected abstract ModelAndView doResolveException(HttpServletRequest request, - HttpServletResponse response, @Nullable Object handler, Exception ex); + protected abstract ModelAndView doResolveException( + HttpServletRequest request, HttpServletResponse response, @Nullable Object handler, Exception ex); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java index bd2dd435bb..ae09e06d17 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -176,12 +176,13 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso * @param handler the executed handler, or {@code null} if none chosen at the time * of the exception (for example, if multipart resolution failed) * @param ex the exception that got thrown during handler execution - * @return a corresponding ModelAndView to forward to, or {@code null} for default processing + * @return a corresponding {@code ModelAndView} to forward to, + * or {@code null} for default processing in the resolution chain */ @Override @Nullable - protected ModelAndView doResolveException(HttpServletRequest request, HttpServletResponse response, - @Nullable Object handler, Exception ex) { + protected ModelAndView doResolveException( + HttpServletRequest request, HttpServletResponse response, @Nullable Object handler, Exception ex) { // Expose ModelAndView for chosen error view. String viewName = determineViewName(ex, request); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java index a064fe856c..542795e616 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -67,8 +67,8 @@ public class ResponseStatusExceptionResolver extends AbstractHandlerExceptionRes @Override @Nullable - protected ModelAndView doResolveException(HttpServletRequest request, HttpServletResponse response, - @Nullable Object handler, Exception ex) { + protected ModelAndView doResolveException( + HttpServletRequest request, HttpServletResponse response, @Nullable Object handler, Exception ex) { try { if (ex instanceof ResponseStatusException) { @@ -86,7 +86,7 @@ public class ResponseStatusExceptionResolver extends AbstractHandlerExceptionRes } } catch (Exception resolveEx) { - logger.warn("Handling of @ResponseStatus resulted in Exception", resolveEx); + logger.warn("ResponseStatus handling resulted in exception", resolveEx); } return null; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java index 82798f96cc..652ddbeb96 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java @@ -164,8 +164,8 @@ public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionRes @Override @Nullable - protected ModelAndView doResolveException(HttpServletRequest request, HttpServletResponse response, - @Nullable Object handler, Exception ex) { + protected ModelAndView doResolveException( + HttpServletRequest request, HttpServletResponse response, @Nullable Object handler, Exception ex) { try { if (ex instanceof HttpRequestMethodNotSupportedException) { @@ -547,7 +547,6 @@ public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionRes return new ModelAndView(); } - /** * Invoked to send a server error. Sets the status to 500 and also sets the * request attribute "javax.servlet.error.exception" to the Exception. -- GitLab