Merge branch '2.1.x'

Author: wilkinsona

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -97,7 +97,7 @@ public JsonContentAssert isEqualTo(Object expected) {
 		if (expected instanceof Resource) {
 			return isEqualToJson((Resource) expected);
 		}
-		failWithMessage("Unsupport type for JSON assert {}", expected.getClass());
+		failWithMessage("Unsupported type for JSON assert {}", expected.getClass());
 		return null;
 	}
 
@@ -434,7 +434,7 @@ public JsonContentAssert isNotEqualTo(Object expected) {
 		if (expected instanceof Resource) {
 			return isNotEqualToJson((Resource) expected);
 		}
-		failWithMessage("Unsupported type for JSON assert {]", expected.getClass());
+		failWithMessage("Unsupported type for JSON assert {}", expected.getClass());
 		return null;
 	}