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

Minor refactoring in PayloadMethodArgumentResolver 

Closes gh-30168
This commit is contained in:
divcon 2023-03-23 00:01:53 +09:00 committed by rstoyanchev
parent 8463eade33
commit 33ef9107e0
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadMethodArgumentResolver.java
View File

@ -136,11 +136,7 @@ public class PayloadMethodArgumentResolver implements HandlerMethodArgumentResol
Class<?> targetClass = resolveTargetClass(parameter, message); Class<?> targetClass = resolveTargetClass(parameter, message);
Class<?> payloadClass = payload.getClass(); Class<?> payloadClass = payload.getClass();
if (ClassUtils.isAssignable(targetClass, payloadClass)) { if (!ClassUtils.isAssignable(targetClass, payloadClass)) {
validate(message, parameter, payload);
return (isOptionalTargetClass ? Optional.of(payload) : payload);
}
else {
if (this.converter instanceof SmartMessageConverter smartConverter) { if (this.converter instanceof SmartMessageConverter smartConverter) {
payload = smartConverter.fromMessage(message, targetClass, parameter); payload = smartConverter.fromMessage(message, targetClass, parameter);
} }
@ -151,10 +147,10 @@ public class PayloadMethodArgumentResolver implements HandlerMethodArgumentResol
throw new MessageConversionException(message, "Cannot convert from [" + throw new MessageConversionException(message, "Cannot convert from [" +
payloadClass.getName() + "] to [" + targetClass.getName() + "] for " + message); payloadClass.getName() + "] to [" + targetClass.getName() + "] for " + message);
} }
}
validate(message, parameter, payload); validate(message, parameter, payload);
return (isOptionalTargetClass ? Optional.of(payload) : payload); return (isOptionalTargetClass ? Optional.of(payload) : payload);
} }
}
private String getParameterName(MethodParameter param) { private String getParameterName(MethodParameter param) {
String paramName = param.getParameterName(); String paramName = param.getParameterName();