Commit 900ec9f3 authored by Phillip Webb's avatar Phillip Webb

Fix error message formatting placeholders

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

See gh-15569
parent 690019ba
...@@ -113,7 +113,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq ...@@ -113,7 +113,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
if (expected instanceof Resource) { if (expected instanceof Resource) {
return isEqualToJson((Resource) expected); return isEqualToJson((Resource) expected);
} }
failWithMessage("Unsupported type for JSON assert {}", expected.getClass()); failWithMessage("Unsupported type for JSON assert %s", expected.getClass());
return null; return null;
} }
...@@ -441,7 +441,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq ...@@ -441,7 +441,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
if (expected instanceof Resource) { if (expected instanceof Resource) {
return isNotEqualToJson((Resource) expected); return isNotEqualToJson((Resource) expected);
} }
failWithMessage("Unsupported type for JSON assert {}", expected.getClass()); failWithMessage("Unsupported type for JSON assert %s", expected.getClass());
return null; return null;
} }
...@@ -1006,14 +1006,14 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq ...@@ -1006,14 +1006,14 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
private JsonContentAssert assertNotFailed(JSONCompareResult result) { private JsonContentAssert assertNotFailed(JSONCompareResult result) {
if (result.failed()) { if (result.failed()) {
failWithMessage("JSON Comparison failure: {}", result.getMessage()); failWithMessage("JSON Comparison failure: %s", result.getMessage());
} }
return this; return this;
} }
private JsonContentAssert assertNotPassed(JSONCompareResult result) { private JsonContentAssert assertNotPassed(JSONCompareResult result) {
if (result.passed()) { if (result.passed()) {
failWithMessage("JSON Comparison failure: {}", result.getMessage()); failWithMessage("JSON Comparison failure: %s", result.getMessage());
} }
return this; return this;
} }
...@@ -1086,7 +1086,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq ...@@ -1086,7 +1086,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
} }
catch (Exception ex) { catch (Exception ex) {
if (required) { if (required) {
failWithMessage("{}. {}", getNoValueMessage(), ex.getMessage()); failWithMessage("%s. %s", getNoValueMessage(), ex.getMessage());
} }
return null; return null;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment