From fa5749103074fbb4f46d8e66ee66999d21414390 Mon Sep 17 00:00:00 2001 From: Priyanshi Date: Tue, 4 Jul 2017 22:22:23 +0530 Subject: [PATCH 1/2] Deprecate JsonContent.assertThat() See gh-9678 --- .../java/org/springframework/boot/test/json/JsonContent.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java index 946f8569eb8..ab243347628 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java @@ -52,7 +52,11 @@ public final class JsonContent implements AssertProvider { this.json = json; } + /** + * Use {@link org.assertj.core.api.Assertions#assertThat AspectJ's assertThat} instead + */ @Override + @Deprecated public JsonContentAssert assertThat() { return new JsonContentAssert(this.resourceLoadClass, this.json); } From 7a4c18eabab5d9f9efc5de46fd1191b04594cb22 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 27 Jul 2017 10:49:24 +0100 Subject: [PATCH 2/2] Polish "Deprecate JsonContent.assertThat()" Closes gh-9678 --- .../org/springframework/boot/test/json/JsonContent.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java index ab243347628..78069abf2d3 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java @@ -53,7 +53,11 @@ public final class JsonContent implements AssertProvider { } /** - * Use {@link org.assertj.core.api.Assertions#assertThat AspectJ's assertThat} instead + * Use AssertJ's {@link org.assertj.core.api.Assertions#assertThat assertThat} + * instead. + * + * @deprecated in favor of AssertJ's {@link org.assertj.core.api.Assertions#assertThat + * assertThat} */ @Override @Deprecated