Merge branch '1.5.x'

2017-07-27 10:51:27 +01:00
parent 56b817e8ad b190a0779d
commit 003fbb6660
1 changed files with 8 additions and 0 deletions
--- 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,15 @@ public final class JsonContent<T> implements AssertProvider<JsonContentAssert> {
 		this.json = json;
 	}

+	/**
+	 * 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
 	public JsonContentAssert assertThat() {
 		return new JsonContentAssert(this.resourceLoadClass, this.json);
 	}