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-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
View File

@@ -338,8 +338,8 @@ class ExtendedBeanInfo implements BeanInfo {
}
@Override
public boolean equals(@Nullable Object obj) {
return (this == obj || (obj instanceof PropertyDescriptor that &&
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof PropertyDescriptor that &&
PropertyDescriptorUtils.equals(this, that)));
}

4
spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
View File

@@ -366,8 +366,8 @@ public class MutablePropertyValues implements PropertyValues, Serializable {
@Override
public boolean equals(@Nullable Object obj) {
return (this == obj || (obj instanceof MutablePropertyValues that &&
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof MutablePropertyValues that &&
this.propertyValueList.equals(that.propertyValueList)));
}

6
spring-beans/src/main/java/org/springframework/beans/factory/config/AutowiredPropertyMarker.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -52,8 +52,8 @@ public final class AutowiredPropertyMarker implements Serializable {
@Override
public boolean equals(@Nullable Object obj) {
return (this == obj);
public boolean equals(@Nullable Object other) {
return (this == other);
}
@Override

4
spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
View File

@@ -81,8 +81,8 @@ class BeanDefinitionResource extends AbstractResource {
* This implementation compares the underlying BeanDefinition.
*/
@Override
public boolean equals(@Nullable Object obj) {
return (this == obj || (obj instanceof BeanDefinitionResource that &&
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof BeanDefinitionResource that &&
this.beanDefinition.equals(that.beanDefinition)));
}

6
spring-beans/src/main/java/org/springframework/beans/factory/support/NullBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,8 +40,8 @@ final class NullBean {
@Override
public boolean equals(@Nullable Object obj) {
return (this == obj || obj == null);
public boolean equals(@Nullable Object other) {
return (this == other || other == null);
}
@Override