From c687e0a9c1291ab36997cfddd48c9205c2a47cf8 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Tue, 11 Feb 2020 18:12:32 +0100 Subject: [PATCH] =?UTF-8?q?#1205=20-=20Fix=20nullability=20warnings=20in?= =?UTF-8?q?=20EntityModelProcessorWrapper.isValueTypeMatch(=E2=80=A6).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/mvc/RepresentationModelProcessorInvoker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorInvoker.java b/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorInvoker.java index ca482ddd..47d47254 100644 --- a/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorInvoker.java +++ b/src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorInvoker.java @@ -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