From 7eed9d96379cfd99fe2a01570ff301618b26529e Mon Sep 17 00:00:00 2001 From: Mihhail Lapushkin Date: Tue, 4 Jul 2017 11:07:42 +0300 Subject: [PATCH 1/3] Use MapAssert that has @SafeVarargs its on methods. --- .../org/springframework/boot/test/json/JsonContentAssert.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java index 6e063ac07947..b6a555bf0521 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java @@ -27,10 +27,10 @@ import org.assertj.core.api.AbstractBooleanAssert; import org.assertj.core.api.AbstractCharSequenceAssert; import org.assertj.core.api.AbstractListAssert; -import org.assertj.core.api.AbstractMapAssert; import org.assertj.core.api.AbstractObjectAssert; import org.assertj.core.api.Assert; import org.assertj.core.api.Assertions; +import org.assertj.core.api.MapAssert; import org.assertj.core.api.ObjectAssert; import org.skyscreamer.jsonassert.JSONCompare; import org.skyscreamer.jsonassert.JSONCompareMode; @@ -966,7 +966,7 @@ public AbstractBooleanAssert extractingJsonPathBooleanValue( * @throws AssertionError if the path is not valid or does not result in a map */ @SuppressWarnings("unchecked") - public AbstractMapAssert extractingJsonPathMapValue( + public MapAssert extractingJsonPathMapValue( CharSequence expression, Object... args) { return Assertions.assertThat( extractingJsonPathValue(expression, args, Map.class, "a map")); From 470df3355cddf5a5c74831589af008d1cd3d61c2 Mon Sep 17 00:00:00 2001 From: Mihhail Lapushkin Date: Tue, 4 Jul 2017 16:05:19 +0300 Subject: [PATCH 2/3] Fixed checkstyle violations. --- .../org/springframework/boot/test/json/JsonContentAssert.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java index b6a555bf0521..6dddcbd9a374 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java @@ -961,6 +961,8 @@ public AbstractBooleanAssert extractingJsonPathBooleanValue( * Extract the map value at the given JSON path for further object assertions. * @param expression the {@link JsonPath} expression * @param args arguments to parameterize the {@code JsonPath} expression with, using + * @param key type + * @param value type * formatting specifiers defined in {@link String#format(String, Object...)} * @return a new assertion object whose object under test is the extracted item * @throws AssertionError if the path is not valid or does not result in a map From 763369515e6409eb772fd8226b8c8594fce93960 Mon Sep 17 00:00:00 2001 From: Mihhail Lapushkin Date: Thu, 6 Jul 2017 10:28:15 +0300 Subject: [PATCH 3/3] Use ListAssert that has @SafeVarargs on its methods. --- .../springframework/boot/test/json/JsonContentAssert.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java index 6dddcbd9a374..49eb88075696 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java @@ -26,12 +26,11 @@ import org.assertj.core.api.AbstractAssert; import org.assertj.core.api.AbstractBooleanAssert; import org.assertj.core.api.AbstractCharSequenceAssert; -import org.assertj.core.api.AbstractListAssert; import org.assertj.core.api.AbstractObjectAssert; import org.assertj.core.api.Assert; import org.assertj.core.api.Assertions; +import org.assertj.core.api.ListAssert; import org.assertj.core.api.MapAssert; -import org.assertj.core.api.ObjectAssert; import org.skyscreamer.jsonassert.JSONCompare; import org.skyscreamer.jsonassert.JSONCompareMode; import org.skyscreamer.jsonassert.JSONCompareResult; @@ -947,11 +946,12 @@ public AbstractBooleanAssert extractingJsonPathBooleanValue( * @param expression the {@link JsonPath} expression * @param args arguments to parameterize the {@code JsonPath} expression with, using * formatting specifiers defined in {@link String#format(String, Object...)} + * @param element type * @return a new assertion object whose object under test is the extracted item * @throws AssertionError if the path is not valid or does not result in an array */ @SuppressWarnings("unchecked") - public AbstractListAssert> extractingJsonPathArrayValue( + public ListAssert extractingJsonPathArrayValue( CharSequence expression, Object... args) { return Assertions.assertThat( extractingJsonPathValue(expression, args, List.class, "an array"));