From 6bed9bec403f2ca45f4fd319c6ee3d79738f36f7 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 16 May 2017 13:26:57 +0200 Subject: [PATCH] #583 - Updated Jackson version to 2.9.0.pr for Spring 5 compatibility in build profile. Fixed super constructor invocation to avoid NullPointerException in super class. --- pom.xml | 1 + .../java/org/springframework/hateoas/hal/Jackson2HalModule.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 981727ba..6d3e8172 100644 --- a/pom.xml +++ b/pom.xml @@ -114,6 +114,7 @@ spring5-next 5.0.0.BUILD-SNAPSHOT + 2.9.0.pr3 diff --git a/src/main/java/org/springframework/hateoas/hal/Jackson2HalModule.java b/src/main/java/org/springframework/hateoas/hal/Jackson2HalModule.java index a9af12fc..729933c1 100644 --- a/src/main/java/org/springframework/hateoas/hal/Jackson2HalModule.java +++ b/src/main/java/org/springframework/hateoas/hal/Jackson2HalModule.java @@ -610,7 +610,7 @@ public class Jackson2HalModule extends SimpleModule { } public HalResourcesDeserializer(JavaType vc) { - this(null, vc); + this(TypeFactory.defaultInstance().constructCollectionLikeType(List.class, vc), vc); } private HalResourcesDeserializer(JavaType type, JavaType contentType) {