From 1d12c7404281568a365e14df4c884e756136f442 Mon Sep 17 00:00:00 2001 From: ali dandach Date: Sun, 24 Sep 2023 23:53:04 +0300 Subject: [PATCH] Use Objects.equals() for null-safe string comparison See gh-31305 --- .../main/java/org/springframework/build/JavaConventions.java | 1 - .../build/optional/OptionalDependenciesPlugin.java | 1 - .../test/context/junit/jupiter/SpringExtension.java | 5 +++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/build/JavaConventions.java index 08050fb6da1..60b791799f5 100644 --- a/buildSrc/src/main/java/org/springframework/build/JavaConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/JavaConventions.java @@ -27,7 +27,6 @@ import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.tasks.compile.JavaCompile; import org.gradle.jvm.toolchain.JavaLanguageVersion; -import org.gradle.jvm.toolchain.JavaToolchainSpec; import org.gradle.jvm.toolchain.JvmVendorSpec; /** diff --git a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java index a7aead41260..3ec751c6457 100644 --- a/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java +++ b/buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java @@ -20,7 +20,6 @@ import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; import org.gradle.api.plugins.JavaBasePlugin; -import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.tasks.SourceSetContainer; diff --git a/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java b/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java index 8b10a7e9bbc..aadf76c43e4 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java @@ -24,6 +24,7 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Parameter; import java.util.Arrays; import java.util.List; +import java.util.Objects; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; @@ -179,7 +180,7 @@ public class SpringExtension implements BeforeAllCallback, AfterAllCallback, Tes testClass.getName(), Arrays.toString(methodsWithErrors))); }, String.class); - if (errorMessage != NO_VIOLATIONS_DETECTED) { + if (!Objects.equals(errorMessage, NO_VIOLATIONS_DETECTED)) { throw new IllegalStateException(errorMessage); } } @@ -218,7 +219,7 @@ public class SpringExtension implements BeforeAllCallback, AfterAllCallback, Tes published by other tests since the application context may be shared."""; }, String.class); - if (errorMessage != NO_VIOLATIONS_DETECTED) { + if (!Objects.equals(errorMessage, NO_VIOLATIONS_DETECTED)) { throw new IllegalStateException(errorMessage); } }