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

Polishing

This commit is contained in:
Juergen Hoeller 2014-02-14 23:48:13 +01:00
parent 8a96d1a6ee
commit bde4964af5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-web/src/main/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolver.java
View File

@ -36,7 +36,7 @@ import org.springframework.web.method.HandlerMethodSelector;
* Discovers {@linkplain ExceptionHandler @ExceptionHandler} methods in a given class, * Discovers {@linkplain ExceptionHandler @ExceptionHandler} methods in a given class,
* including all of its superclasses, and helps to resolve a given {@link Exception} * including all of its superclasses, and helps to resolve a given {@link Exception}
* to the exception types supported by a given {@link Method}. * to the exception types supported by a given {@link Method}.
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @since 3.1 * @since 3.1
*/ */
@ -79,8 +79,8 @@ public class ExceptionHandlerMethodResolver {
/** /**
* Extract exception mappings from the {@code @ExceptionHandler} annotation * Extract exception mappings from the {@code @ExceptionHandler} annotation first,
* first and as a fall-back from the method signature. * and then as a fallback from the method signature itself.
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private List<Class<? extends Throwable>> detectExceptionMappings(Method method) { private List<Class<? extends Throwable>> detectExceptionMappings(Method method) {
@ -115,7 +115,7 @@ public class ExceptionHandlerMethodResolver {
* Whether the contained type has any exception mappings. * Whether the contained type has any exception mappings.
*/ */
public boolean hasExceptionMappings() { public boolean hasExceptionMappings() {
return (this.mappedMethods.size() > 0); return !this.mappedMethods.isEmpty();
} }
/** /**
@ -140,11 +140,11 @@ public class ExceptionHandlerMethodResolver {
method = getMappedMethod(exceptionType); method = getMappedMethod(exceptionType);
this.exceptionLookupCache.put(exceptionType, (method != null ? method : NO_METHOD_FOUND)); this.exceptionLookupCache.put(exceptionType, (method != null ? method : NO_METHOD_FOUND));
} }
return method != NO_METHOD_FOUND ? method : null; return (method != NO_METHOD_FOUND ? method : null);
} }
/** /**
* Return the method mapped to the given exception type or {@code null}. * Return the {@link Method} mapped to the given exception type, or {@code null} if none.
*/ */
private Method getMappedMethod(Class<? extends Exception> exceptionType) { private Method getMappedMethod(Class<? extends Exception> exceptionType) {
List<Class<? extends Throwable>> matches = new ArrayList<Class<? extends Throwable>>(); List<Class<? extends Throwable>> matches = new ArrayList<Class<? extends Throwable>>();