From 900ec9f3ec7e3d740022d5f2e622d1469f606417 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Tue, 23 Jul 2019 15:18:40 +0100
Subject: [PATCH] Fix error message formatting placeholders

Fix the formatting message placeholders to '%s' since '{}' isn't
supported by AssertJ.

See gh-15569
---
 .../boot/test/json/JsonContentAssert.java              | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java
index c40762ae24..c2bb307831 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java
@@ -113,7 +113,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
 		if (expected instanceof Resource) {
 			return isEqualToJson((Resource) expected);
 		}
-		failWithMessage("Unsupported type for JSON assert {}", expected.getClass());
+		failWithMessage("Unsupported type for JSON assert %s", expected.getClass());
 		return null;
 	}
 
@@ -441,7 +441,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
 		if (expected instanceof Resource) {
 			return isNotEqualToJson((Resource) expected);
 		}
-		failWithMessage("Unsupported type for JSON assert {}", expected.getClass());
+		failWithMessage("Unsupported type for JSON assert %s", expected.getClass());
 		return null;
 	}
 
@@ -1006,14 +1006,14 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
 
 	private JsonContentAssert assertNotFailed(JSONCompareResult result) {
 		if (result.failed()) {
-			failWithMessage("JSON Comparison failure: {}", result.getMessage());
+			failWithMessage("JSON Comparison failure: %s", result.getMessage());
 		}
 		return this;
 	}
 
 	private JsonContentAssert assertNotPassed(JSONCompareResult result) {
 		if (result.passed()) {
-			failWithMessage("JSON Comparison failure: {}", result.getMessage());
+			failWithMessage("JSON Comparison failure: %s", result.getMessage());
 		}
 		return this;
 	}
@@ -1086,7 +1086,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
 			}
 			catch (Exception ex) {
 				if (required) {
-					failWithMessage("{}. {}", getNoValueMessage(), ex.getMessage());
+					failWithMessage("%s. %s", getNoValueMessage(), ex.getMessage());
 				}
 				return null;
 			}