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

#1003 - BoundMethodParameter now only uses first level nesting for JDK 8 optional.

Browse Source
This commit is contained in:
Oliver Drotbohm
2019-06-27 14:06:16 +02:00
parent 3b65aea8a5
commit 628148a169
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/hateoas/server/core/WebHandler.java
View File

@@ -32,6 +32,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.BiFunction;
import java.util.function.Function;
@@ -370,10 +371,12 @@ public class WebHandler {
Assert.notNull(parameter, "MethodParameter must not be null!");
boolean isOptionalWrapper = Optional.class.isAssignableFrom(parameter.getParameterType());
this.parameter = parameter;
this.value = value;
this.attribute = attribute;
this.parameterTypeDescriptor = TypeDescriptor.nested(parameter, parameter.isOptional() ? 1 : 0);
this.parameterTypeDescriptor = TypeDescriptor.nested(parameter, isOptionalWrapper ? 1 : 0);
}
/**