Skip to content

Commit 285b1b4

Browse files
sbrannensbrannen
committed
Update Javadoc in DefaultHandlerExceptionResolver to reflect changes
See gh-27052
1 parent 7f0abb7 commit 285b1b4

File tree

1 file changed

+26
-16
lines changed

1 file changed

+26
-16
lines changed

‎spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,8 @@ else if (ex instanceof BindException) {
257257
* @param response current HTTP response
258258
* @param handler the executed handler, or {@code null} if none chosen
259259
* at the time of the exception (for example, if multipart resolution failed)
260-
* @return an empty ModelAndView indicating the exception was handled
260+
* @return an empty {@code ModelAndView} indicating the exception was handled, or
261+
* {@code null} indicating the exception should be handled in {@link #handleErrorResponse}
261262
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
262263
*/
263264
@Nullable
@@ -277,7 +278,8 @@ protected ModelAndView handleHttpRequestMethodNotSupported(HttpRequestMethodNotS
277278
* @param request current HTTP request
278279
* @param response current HTTP response
279280
* @param handler the executed handler
280-
* @return an empty ModelAndView indicating the exception was handled
281+
* @return an empty {@code ModelAndView} indicating the exception was handled, or
282+
* {@code null} indicating the exception should be handled in {@link #handleErrorResponse}
281283
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
282284
*/
283285
@Nullable
@@ -297,7 +299,8 @@ protected ModelAndView handleHttpMediaTypeNotSupported(HttpMediaTypeNotSupported
297299
* @param request current HTTP request
298300
* @param response current HTTP response
299301
* @param handler the executed handler
300-
* @return an empty ModelAndView indicating the exception was handled
302+
* @return an empty {@code ModelAndView} indicating the exception was handled, or
303+
* {@code null} indicating the exception should be handled in {@link #handleErrorResponse}
301304
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
302305
*/
303306
@Nullable
@@ -315,7 +318,8 @@ protected ModelAndView handleHttpMediaTypeNotAcceptable(HttpMediaTypeNotAcceptab
315318
* @param request current HTTP request
316319
* @param response current HTTP response
317320
* @param handler the executed handler
318-
* @return an empty ModelAndView indicating the exception was handled
321+
* @return an empty {@code ModelAndView} indicating the exception was handled, or
322+
* {@code null} indicating the exception should be handled in {@link #handleErrorResponse}
319323
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
320324
* @since 4.2
321325
*/
@@ -334,7 +338,8 @@ protected ModelAndView handleMissingPathVariable(MissingPathVariableException ex
334338
* @param request current HTTP request
335339
* @param response current HTTP response
336340
* @param handler the executed handler
337-
* @return an empty ModelAndView indicating the exception was handled
341+
* @return an empty {@code ModelAndView} indicating the exception was handled, or
342+
* {@code null} indicating the exception should be handled in {@link #handleErrorResponse}
338343
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
339344
*/
340345
@Nullable
@@ -351,7 +356,8 @@ protected ModelAndView handleMissingServletRequestParameter(MissingServletReques
351356
* @param request current HTTP request
352357
* @param response current HTTP response
353358
* @param handler the executed handler
354-
* @return an empty ModelAndView indicating the exception was handled
359+
* @return an empty {@code ModelAndView} indicating the exception was handled, or
360+
* {@code null} indicating the exception should be handled in {@link #handleErrorResponse}
355361
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
356362
*/
357363
@Nullable
@@ -370,7 +376,8 @@ protected ModelAndView handleMissingServletRequestPartException(MissingServletRe
370376
* @param request current HTTP request
371377
* @param response current HTTP response
372378
* @param handler the executed handler
373-
* @return an empty ModelAndView indicating the exception was handled
379+
* @return an empty {@code ModelAndView} indicating the exception was handled, or
380+
* {@code null} indicating the exception should be handled in {@link #handleErrorResponse}
374381
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
375382
*/
376383
@Nullable
@@ -388,7 +395,8 @@ protected ModelAndView handleServletRequestBindingException(ServletRequestBindin
388395
* @param request current HTTP request
389396
* @param response current HTTP response
390397
* @param handler the executed handler
391-
* @return an empty ModelAndView indicating the exception was handled
398+
* @return an empty {@code ModelAndView} indicating the exception was handled, or
399+
* {@code null} indicating the exception should be handled in {@link #handleErrorResponse}
392400
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
393401
*/
394402
@Nullable
@@ -407,7 +415,8 @@ protected ModelAndView handleMethodArgumentNotValidException(MethodArgumentNotVa
407415
* @param response current HTTP response
408416
* @param handler the executed handler, or {@code null} if none chosen
409417
* at the time of the exception (for example, if multipart resolution failed)
410-
* @return an empty ModelAndView indicating the exception was handled
418+
* @return an empty {@code ModelAndView} indicating the exception was handled, or
419+
* {@code null} indicating the exception should be handled in {@link #handleErrorResponse}
411420
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
412421
* @since 4.0
413422
*/
@@ -428,7 +437,8 @@ protected ModelAndView handleNoHandlerFoundException(NoHandlerFoundException ex,
428437
* @param response current HTTP response
429438
* @param handler the executed handler, or {@code null} if none chosen
430439
* at the time of the exception (for example, if multipart resolution failed)
431-
* @return an empty ModelAndView indicating the exception was handled
440+
* @return an empty {@code ModelAndView} indicating the exception was handled, or
441+
* {@code null} indicating the exception should be handled in {@link #handleErrorResponse}
432442
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
433443
* @since 4.2.8
434444
*/
@@ -449,7 +459,7 @@ protected ModelAndView handleAsyncRequestTimeoutException(AsyncRequestTimeoutExc
449459
* @param request current HTTP request
450460
* @param response current HTTP response
451461
* @param handler the executed handler
452-
* @return an empty ModelAndView indicating the exception was handled
462+
* @return an empty {@code ModelAndView} indicating the exception was handled
453463
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
454464
* @since 6.0
455465
*/
@@ -485,7 +495,7 @@ protected ModelAndView handleErrorResponse(ErrorResponse errorResponse,
485495
* @param request current HTTP request
486496
* @param response current HTTP response
487497
* @param handler the executed handler
488-
* @return an empty ModelAndView indicating the exception was handled
498+
* @return an empty {@code ModelAndView} indicating the exception was handled
489499
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
490500
*/
491501
protected ModelAndView handleConversionNotSupported(ConversionNotSupportedException ex,
@@ -503,7 +513,7 @@ protected ModelAndView handleConversionNotSupported(ConversionNotSupportedExcept
503513
* @param request current HTTP request
504514
* @param response current HTTP response
505515
* @param handler the executed handler
506-
* @return an empty ModelAndView indicating the exception was handled
516+
* @return an empty {@code ModelAndView} indicating the exception was handled
507517
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
508518
*/
509519
protected ModelAndView handleTypeMismatch(TypeMismatchException ex,
@@ -523,7 +533,7 @@ protected ModelAndView handleTypeMismatch(TypeMismatchException ex,
523533
* @param request current HTTP request
524534
* @param response current HTTP response
525535
* @param handler the executed handler
526-
* @return an empty ModelAndView indicating the exception was handled
536+
* @return an empty {@code ModelAndView} indicating the exception was handled
527537
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
528538
*/
529539
protected ModelAndView handleHttpMessageNotReadable(HttpMessageNotReadableException ex,
@@ -544,7 +554,7 @@ protected ModelAndView handleHttpMessageNotReadable(HttpMessageNotReadableExcept
544554
* @param request current HTTP request
545555
* @param response current HTTP response
546556
* @param handler the executed handler
547-
* @return an empty ModelAndView indicating the exception was handled
557+
* @return an empty {@code ModelAndView} indicating the exception was handled
548558
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
549559
*/
550560
protected ModelAndView handleHttpMessageNotWritable(HttpMessageNotWritableException ex,
@@ -562,7 +572,7 @@ protected ModelAndView handleHttpMessageNotWritable(HttpMessageNotWritableExcept
562572
* @param request current HTTP request
563573
* @param response current HTTP response
564574
* @param handler the executed handler
565-
* @return an empty ModelAndView indicating the exception was handled
575+
* @return an empty {@code ModelAndView} indicating the exception was handled
566576
* @throws IOException potentially thrown from {@link HttpServletResponse#sendError}
567577
*/
568578
protected ModelAndView handleBindException(BindException ex, HttpServletRequest request,

0 commit comments

Comments
 (0)