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

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2023-08-04 02:40:17 +02:00
parent a6ff95a69c 18966d048c
commit 4e863c5a75
56 changed files with 198 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java
View File

@@ -333,8 +333,8 @@ public class MessageHeaders implements Map<String, Object>, Serializable {
// equals, hashCode, toString
@Override
public boolean equals(@Nullable Object obj) {
return (this == obj || (obj instanceof MessageHeaders that && this.headers.equals(that.headers)));
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof MessageHeaders that && this.headers.equals(that.headers)));
}
@Override

4
spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageMappingInfo.java
View File

@@ -77,8 +77,8 @@ public class SimpMessageMappingInfo implements MessageCondition<SimpMessageMappi
@Override
public boolean equals(@Nullable Object obj) {
return (this == obj) || (obj instanceof SimpMessageMappingInfo that && this.delegate.equals(that.delegate));
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof SimpMessageMappingInfo that && this.delegate.equals(that.delegate)));
}
@Override

4
spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java
View File

@@ -481,8 +481,8 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
}
@Override
public boolean equals(@Nullable Object obj) {
return (this == obj || (obj instanceof Subscription that && this.id.equals(that.id)));
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof Subscription that && this.id.equals(that.id)));
}
@Override

4
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
View File

@@ -555,8 +555,8 @@ public class StompHeaders implements MultiValueMap<String, String>, Serializable
@Override
public boolean equals(@Nullable Object obj) {
return (this == obj || (obj instanceof StompHeaders that && this.headers.equals(that.headers)));
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof StompHeaders that && this.headers.equals(that.headers)));
}
@Override

8
spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java
View File

@@ -369,8 +369,8 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
@Override
public boolean equals(@Nullable Object obj) {
return (this == obj || (obj instanceof SimpUser that && this.name.equals(that.getName())));
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof SimpUser that && this.name.equals(that.getName())));
}
@Override
@@ -455,8 +455,8 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
}
@Override
public boolean equals(@Nullable Object obj) {
return (this == obj || (obj instanceof SimpSession that && this.id.equals(that.getId())));
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof SimpSession that && this.id.equals(that.getId())));
}
@Override