From f0b2f7186a013d1621869eccf50a1a273b12be5a Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 18 Nov 2019 16:12:55 +0100 Subject: [PATCH] Polishing --- .../annotation/RequestMappingHandlerAdapter.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java index 9dd6be0c14..53eda754d0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java @@ -917,9 +917,9 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter } List attrMethods = new ArrayList<>(); // Global methods first - this.modelAttributeAdviceCache.forEach((clazz, methodSet) -> { - if (clazz.isApplicableToBeanType(handlerType)) { - Object bean = clazz.resolveBean(); + this.modelAttributeAdviceCache.forEach((controllerAdviceBean, methodSet) -> { + if (controllerAdviceBean.isApplicableToBeanType(handlerType)) { + Object bean = controllerAdviceBean.resolveBean(); for (Method method : methodSet) { attrMethods.add(createModelAttributeMethod(binderFactory, bean, method)); } @@ -951,9 +951,9 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter } List initBinderMethods = new ArrayList<>(); // Global methods first - this.initBinderAdviceCache.forEach((clazz, methodSet) -> { - if (clazz.isApplicableToBeanType(handlerType)) { - Object bean = clazz.resolveBean(); + this.initBinderAdviceCache.forEach((controllerAdviceBean, methodSet) -> { + if (controllerAdviceBean.isApplicableToBeanType(handlerType)) { + Object bean = controllerAdviceBean.resolveBean(); for (Method method : methodSet) { initBinderMethods.add(createInitBinderMethod(bean, method)); } -- GitLab