Browse Source

Further improve null-safety of JsonContentAssert

See gh-46926
pull/47234/head
Moritz Halbritter 3 months ago
parent
commit
8c0018d739
  1. 6
      core/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java

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

@ -63,7 +63,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
* @param resourceLoadClass the source class used to load resources * @param resourceLoadClass the source class used to load resources
* @param json the actual JSON content * @param json the actual JSON content
*/ */
public JsonContentAssert(Class<?> resourceLoadClass, CharSequence json) { public JsonContentAssert(Class<?> resourceLoadClass, @Nullable CharSequence json) {
this(resourceLoadClass, null, json); this(resourceLoadClass, null, json);
} }
@ -75,7 +75,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
* @param json the actual JSON content * @param json the actual JSON content
* @since 1.4.1 * @since 1.4.1
*/ */
public JsonContentAssert(Class<?> resourceLoadClass, @Nullable Charset charset, CharSequence json) { public JsonContentAssert(Class<?> resourceLoadClass, @Nullable Charset charset, @Nullable CharSequence json) {
this(resourceLoadClass, charset, json, Configuration.defaultConfiguration()); this(resourceLoadClass, charset, json, Configuration.defaultConfiguration());
} }
@ -87,7 +87,7 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
* @param json the actual JSON content * @param json the actual JSON content
* @param configuration the json-path configuration * @param configuration the json-path configuration
*/ */
JsonContentAssert(Class<?> resourceLoadClass, @Nullable Charset charset, CharSequence json, JsonContentAssert(Class<?> resourceLoadClass, @Nullable Charset charset, @Nullable CharSequence json,
Configuration configuration) { Configuration configuration) {
super(json, JsonContentAssert.class); super(json, JsonContentAssert.class);
this.configuration = configuration; this.configuration = configuration;

Loading…
Cancel
Save