From e9416b369e505ac01278464eb320e1d993d5e50a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 9 Nov 2020 18:23:45 +0100 Subject: [PATCH] Polishing --- .../web/method/annotation/MapMethodProcessor.java | 10 +++++----- .../web/method/annotation/ModelMethodProcessor.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java b/spring-web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java index fa5cfc46775..4f1480b5674 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -42,8 +42,8 @@ public class MapMethodProcessor implements HandlerMethodArgumentResolver, Handle @Override public boolean supportsParameter(MethodParameter parameter) { - return Map.class.isAssignableFrom(parameter.getParameterType()) && - parameter.getParameterAnnotations().length == 0; + return (Map.class.isAssignableFrom(parameter.getParameterType()) && + parameter.getParameterAnnotations().length == 0); } @Override @@ -70,8 +70,8 @@ public class MapMethodProcessor implements HandlerMethodArgumentResolver, Handle } else if (returnValue != null) { // should not happen - throw new UnsupportedOperationException("Unexpected return type: " + - returnType.getParameterType().getName() + " in method: " + returnType.getMethod()); + throw new UnsupportedOperationException("Unexpected return type [" + + returnType.getParameterType().getName() + "] in method: " + returnType.getMethod()); } } diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java index 52a2756ac18..3915259ae7e 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2020 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. @@ -70,8 +70,8 @@ public class ModelMethodProcessor implements HandlerMethodArgumentResolver, Hand } else { // should not happen - throw new UnsupportedOperationException("Unexpected return type: " + - returnType.getParameterType().getName() + " in method: " + returnType.getMethod()); + throw new UnsupportedOperationException("Unexpected return type [" + + returnType.getParameterType().getName() + "] in method: " + returnType.getMethod()); } }