Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31305 from alidandach

Browse Source 
* pr/31305:
  Use Objects.equals() for null-safe string comparison

Closes gh-31305
This commit is contained in:
Stéphane Nicoll
2023-09-25 08:33:05 +02:00
parent bc3d98565c 1d12c74042
commit daa902bf20
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
buildSrc/src/main/java/org/springframework/build/JavaConventions.java
View File

@@ -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;
/**

1
buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java
View File

@@ -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;

5
spring-test/src/main/java/org/springframework/test/context/junit/jupiter/SpringExtension.java
View File

@@ -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);
}
}