From 88f51fafeefe658b47a4bf7a4d98f69d714114ab Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 29 Dec 2025 00:09:07 +0900 Subject: [PATCH] Use static imports for Assertions.assertThat() consistently See gh-48630 Signed-off-by: Johnny Lim --- .../boot/test/json/JsonContentAssert.java | 15 ++++++++------- .../boot/image/assertions/ImageAssert.java | 5 +++-- 2 files changed, 11 insertions(+), 9 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 9ae8fa99f43..fb3f3dad18b 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 @@ -30,7 +30,6 @@ import org.assertj.core.api.AbstractBooleanAssert; import org.assertj.core.api.AbstractCharSequenceAssert; import org.assertj.core.api.AbstractObjectAssert; import org.assertj.core.api.Assert; -import org.assertj.core.api.Assertions; import org.assertj.core.api.ListAssert; import org.assertj.core.api.MapAssert; import org.skyscreamer.jsonassert.JSONCompare; @@ -42,6 +41,8 @@ import org.springframework.core.io.Resource; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * AssertJ {@link Assert} for {@link JsonContent}. * @@ -915,7 +916,7 @@ public class JsonContentAssert extends AbstractAssert extractingJsonPathValue(CharSequence expression, Object... args) { - return Assertions.assertThat(new JsonPathValue(expression, args).getValue(false)); + return assertThat(new JsonPathValue(expression, args).getValue(false)); } /** @@ -928,7 +929,7 @@ public class JsonContentAssert extends AbstractAssert extractingJsonPathStringValue(CharSequence expression, Object... args) { - return Assertions.assertThat(extractingJsonPathValue(expression, args, String.class, "a string")); + return assertThat(extractingJsonPathValue(expression, args, String.class, "a string")); } /** @@ -940,7 +941,7 @@ public class JsonContentAssert extends AbstractAssert extractingJsonPathNumberValue(CharSequence expression, Object... args) { - return Assertions.assertThat(extractingJsonPathValue(expression, args, Number.class, "a number")); + return assertThat(extractingJsonPathValue(expression, args, Number.class, "a number")); } /** @@ -952,7 +953,7 @@ public class JsonContentAssert extends AbstractAssert extractingJsonPathBooleanValue(CharSequence expression, Object... args) { - return Assertions.assertThat(extractingJsonPathValue(expression, args, Boolean.class, "a boolean")); + return assertThat(extractingJsonPathValue(expression, args, Boolean.class, "a boolean")); } /** @@ -966,7 +967,7 @@ public class JsonContentAssert extends AbstractAssert ListAssert extractingJsonPathArrayValue(CharSequence expression, Object... args) { - return Assertions.assertThat(extractingJsonPathValue(expression, args, List.class, "an array")); + return assertThat(extractingJsonPathValue(expression, args, List.class, "an array")); } /** @@ -981,7 +982,7 @@ public class JsonContentAssert extends AbstractAssert MapAssert extractingJsonPathMapValue(CharSequence expression, Object... args) { - return Assertions.assertThat(extractingJsonPathValue(expression, args, Map.class, "a map")); + return assertThat(extractingJsonPathValue(expression, args, Map.class, "a map")); } @SuppressWarnings("unchecked") diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/assertions/ImageAssert.java b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/assertions/ImageAssert.java index fbc242a647d..1501c151463 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/assertions/ImageAssert.java +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/assertions/ImageAssert.java @@ -27,7 +27,6 @@ import java.util.function.Consumer; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.assertj.core.api.AbstractAssert; -import org.assertj.core.api.Assertions; import org.assertj.core.api.ListAssert; import org.springframework.boot.buildpack.platform.docker.DockerApi; @@ -36,6 +35,8 @@ import org.springframework.boot.buildpack.platform.docker.type.Layer; import org.springframework.boot.test.json.JsonContentAssert; import org.springframework.util.StreamUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * AssertJ {@link org.assertj.core.api.Assert} for Docker image contents. * @@ -92,7 +93,7 @@ public class ImageAssert extends AbstractAssert { catch (IOException ex) { failWithMessage("IOException while reading image layer archive: '%s'", ex.getMessage()); } - return Assertions.assertThat(entryNames); + return assertThat(entryNames); } public void jsonEntry(String name, Consumer assertConsumer) {