Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent support for java.util.Optional for all applicable handler method arguments

Browse Source 
Issue: SPR-12171
This commit is contained in:
Juergen Hoeller
2014-09-10 01:27:46 +02:00
parent 559e81bec7
commit 5790fc904a
8 changed files with 83 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java
View File

@@ -30,7 +30,6 @@ import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.messaging.Message;
import org.springframework.messaging.handler.annotation.ValueConstants;
import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
/**
@@ -88,28 +87,28 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
Class<?> paramType = parameter.getParameterType();
NamedValueInfo namedValueInfo = getNamedValueInfo(parameter);
Object value = resolveArgumentInternal(parameter, message, namedValueInfo.name);
if (value == null) {
Object arg = resolveArgumentInternal(parameter, message, namedValueInfo.name);
if (arg == null) {
if (namedValueInfo.defaultValue != null) {
value = resolveDefaultValue(namedValueInfo.defaultValue);
arg = resolveDefaultValue(namedValueInfo.defaultValue);
}
else if (namedValueInfo.required) {
else if (namedValueInfo.required && !parameter.getParameterType().getName().equals("java.util.Optional")) {
handleMissingValue(namedValueInfo.name, parameter, message);
}
value = handleNullValue(namedValueInfo.name, value, paramType);
arg = handleNullValue(namedValueInfo.name, arg, paramType);
}
else if ("".equals(value) && namedValueInfo.defaultValue != null) {
value = resolveDefaultValue(namedValueInfo.defaultValue);
else if ("".equals(arg) && namedValueInfo.defaultValue != null) {
arg = resolveDefaultValue(namedValueInfo.defaultValue);
}
if (!ClassUtils.isAssignableValue(paramType, value)) {
value = this.conversionService.convert(value,
TypeDescriptor.valueOf(value.getClass()), new TypeDescriptor(parameter));
if (!ClassUtils.isAssignableValue(paramType, arg)) {
arg = this.conversionService.convert(
arg, TypeDescriptor.valueOf(arg.getClass()), new TypeDescriptor(parameter));
}
handleResolvedValue(value, namedValueInfo.name, parameter, message);
handleResolvedValue(arg, namedValueInfo.name, parameter, message);
return value;
return arg;
}
/**
@@ -140,10 +139,12 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
String name = info.name;
if (info.name.length() == 0) {
name = parameter.getParameterName();
Assert.notNull(name, "Name for argument type [" + parameter.getParameterType().getName()
+ "] not available, and parameter name information not found in class file either.");
if (name == null) {
throw new IllegalArgumentException("Name for argument type [" + parameter.getParameterType().getName() +
"] not available, and parameter name information not found in class file either.");
}
}
String defaultValue = ValueConstants.DEFAULT_NONE.equals(info.defaultValue) ? null : info.defaultValue;
String defaultValue = (ValueConstants.DEFAULT_NONE.equals(info.defaultValue) ? null : info.defaultValue);
return new NamedValueInfo(name, info.required, defaultValue);
}