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

Merge branch '6.0.x'

Browse Source 
# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java
This commit is contained in:
Juergen Hoeller
2023-07-19 00:37:06 +02:00
parent 33862d98ea 2f33e77ab4
commit 25ea1f4c0f
97 changed files with 405 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-test/src/test/java/org/springframework/test/web/Person.java
View File

@@ -68,15 +68,10 @@ public class Person {
@Override
public boolean equals(@Nullable Object other) {
if (this == other) {
return true;
}
if (!(other instanceof Person otherPerson)) {
return false;
}
return (ObjectUtils.nullSafeEquals(this.name, otherPerson.name) &&
ObjectUtils.nullSafeEquals(this.someDouble, otherPerson.someDouble) &&
ObjectUtils.nullSafeEquals(this.someBoolean, otherPerson.someBoolean));
return (this == other || (other instanceof Person that &&
ObjectUtils.nullSafeEquals(this.name, that.name) &&
ObjectUtils.nullSafeEquals(this.someDouble, that.someDouble) &&
ObjectUtils.nullSafeEquals(this.someBoolean, that.someBoolean)));
}
@Override