From 3bfcfaa795daea4138a978a9ee4b70062b39791a Mon Sep 17 00:00:00 2001
From: Moritz Halbritter <moritz.halbritter@broadcom.com>
Date: Tue, 16 Sep 2025 11:55:16 +0200
Subject: [PATCH] Improve null-safety of JsonContentAssert

See gh-46926
---
 .../boot/test/json/JsonContentAssert.java      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/core/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java
index 8fe013a19e0..075e81ff5bb 100644
--- a/core/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java
+++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java
@@ -1000,9 +1000,11 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
 		if (this.actual == null) {
 			return compareForNull(expectedJson);
 		}
+		if (expectedJson == null) {
+			return fail("Expected JSON but got null");
+		}
 		try {
-			return JSONCompare.compareJSON((expectedJson != null) ? expectedJson.toString() : null,
-					this.actual.toString(), compareMode);
+			return JSONCompare.compareJSON(expectedJson.toString(), this.actual.toString(), compareMode);
 		}
 		catch (Exception ex) {
 			if (ex instanceof RuntimeException runtimeException) {
@@ -1016,9 +1018,11 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
 		if (this.actual == null) {
 			return compareForNull(expectedJson);
 		}
+		if (expectedJson == null) {
+			return fail("Expected JSON but got null");
+		}
 		try {
-			return JSONCompare.compareJSON((expectedJson != null) ? expectedJson.toString() : null,
-					this.actual.toString(), comparator);
+			return JSONCompare.compareJSON(expectedJson.toString(), this.actual.toString(), comparator);
 		}
 		catch (Exception ex) {
 			if (ex instanceof RuntimeException runtimeException) {
@@ -1037,6 +1041,12 @@ public class JsonContentAssert extends AbstractAssert<JsonContentAssert, CharSeq
 		return result;
 	}
 
+	private JSONCompareResult fail(String message) {
+		JSONCompareResult result = new JSONCompareResult();
+		result.fail(message);
+		return result;
+	}
+
 	private JsonContentAssert assertNotFailed(JSONCompareResult result) {
 		if (result.failed()) {
 			failWithMessage("JSON Comparison failure: %s", result.getMessage());