From a825a337d8e67a17ddbc695d493e6b71f5ec6997 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 14 Jun 2017 14:06:10 +0200 Subject: [PATCH] DATACMNS-1089 - Prepare upgrade to AssertJ 3.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fully qualify call to ClassTypeInformation.from(…) as AssertJ 3.8 introduces a method that results in ambiguity in the static imports for from(null). --- .../data/util/ClassTypeInformationUnitTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java b/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java index d172b1503..988c68b0f 100755 --- a/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java +++ b/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java @@ -16,7 +16,7 @@ package org.springframework.data.util; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.util.ClassTypeInformation.*; +import static org.springframework.data.util.ClassTypeInformation.from; import javaslang.collection.Traversable; @@ -294,7 +294,7 @@ public class ClassTypeInformationUnitTests { @Test(expected = IllegalArgumentException.class) // DATACMNS-387 public void rejectsNullClass() { - from(null); + ClassTypeInformation.from(null); } @Test // DATACMNS-422