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

#1205 - Fix nullability warnings in EntityModelProcessorWrapper.isValueTypeMatch(…).

Browse Source
This commit is contained in:
Oliver Drotbohm
2020-02-11 18:12:32 +01:00
parent 6ff57dea4c
commit c687e0a9c1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorInvoker.java
View File

@@ -310,7 +310,7 @@ public class RepresentationModelProcessorInvoker {
*/
private static boolean isValueTypeMatch(@Nullable EntityModel<?> entityModel, @Nullable ResolvableType target) {
if (entityModel == null || !isRawTypeAssignable(target, entityModel.getClass())) {
if (target == null || entityModel == null || !isRawTypeAssignable(target, entityModel.getClass())) {
return false;
}
@@ -323,7 +323,7 @@ public class RepresentationModelProcessorInvoker {
ResolvableType type = findGenericType(target, EntityModel.class);
return target.isAssignableFrom(content.getClass()) || //
(type != null && type.getGeneric(0).isAssignableFrom(ResolvableType.forClass(content.getClass())));
type != null && type.getGeneric(0).isAssignableFrom(ResolvableType.forClass(content.getClass()));
}
@Nullable