Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revise AbstractBeanDefinition equals implementation #24048

Merged
merged 1 commit into from Nov 21, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -1162,28 +1162,28 @@ public boolean equals(@Nullable Object other) {
}
AbstractBeanDefinition that = (AbstractBeanDefinition) other;
boolean rtn = ObjectUtils.nullSafeEquals(getBeanClassName(), that.getBeanClassName());
rtn = rtn &= ObjectUtils.nullSafeEquals(this.scope, that.scope);
rtn = rtn &= this.abstractFlag == that.abstractFlag;
rtn = rtn &= this.lazyInit == that.lazyInit;
rtn = rtn &= this.autowireMode == that.autowireMode;
rtn = rtn &= this.dependencyCheck == that.dependencyCheck;
rtn = rtn &= Arrays.equals(this.dependsOn, that.dependsOn);
rtn = rtn &= this.autowireCandidate == that.autowireCandidate;
rtn = rtn &= ObjectUtils.nullSafeEquals(this.qualifiers, that.qualifiers);
rtn = rtn &= this.primary == that.primary;
rtn = rtn &= this.nonPublicAccessAllowed == that.nonPublicAccessAllowed;
rtn = rtn &= this.lenientConstructorResolution == that.lenientConstructorResolution;
rtn = rtn &= ObjectUtils.nullSafeEquals(this.constructorArgumentValues, that.constructorArgumentValues);
rtn = rtn &= ObjectUtils.nullSafeEquals(this.propertyValues, that.propertyValues);
rtn = rtn &= ObjectUtils.nullSafeEquals(this.methodOverrides, that.methodOverrides);
rtn = rtn &= ObjectUtils.nullSafeEquals(this.factoryBeanName, that.factoryBeanName);
rtn = rtn &= ObjectUtils.nullSafeEquals(this.factoryMethodName, that.factoryMethodName);
rtn = rtn &= ObjectUtils.nullSafeEquals(this.initMethodName, that.initMethodName);
rtn = rtn &= this.enforceInitMethod == that.enforceInitMethod;
rtn = rtn &= ObjectUtils.nullSafeEquals(this.destroyMethodName, that.destroyMethodName);
rtn = rtn &= this.enforceDestroyMethod == that.enforceDestroyMethod;
rtn = rtn &= this.synthetic == that.synthetic;
rtn = rtn &= this.role == that.role;
rtn &= ObjectUtils.nullSafeEquals(this.scope, that.scope);
rtn &= this.abstractFlag == that.abstractFlag;
rtn &= this.lazyInit == that.lazyInit;
rtn &= this.autowireMode == that.autowireMode;
rtn &= this.dependencyCheck == that.dependencyCheck;
rtn &= Arrays.equals(this.dependsOn, that.dependsOn);
rtn &= this.autowireCandidate == that.autowireCandidate;
rtn &= ObjectUtils.nullSafeEquals(this.qualifiers, that.qualifiers);
rtn &= this.primary == that.primary;
rtn &= this.nonPublicAccessAllowed == that.nonPublicAccessAllowed;
rtn &= this.lenientConstructorResolution == that.lenientConstructorResolution;
rtn &= ObjectUtils.nullSafeEquals(this.constructorArgumentValues, that.constructorArgumentValues);
rtn &= ObjectUtils.nullSafeEquals(this.propertyValues, that.propertyValues);
rtn &= ObjectUtils.nullSafeEquals(this.methodOverrides, that.methodOverrides);
rtn &= ObjectUtils.nullSafeEquals(this.factoryBeanName, that.factoryBeanName);
rtn &= ObjectUtils.nullSafeEquals(this.factoryMethodName, that.factoryMethodName);
rtn &= ObjectUtils.nullSafeEquals(this.initMethodName, that.initMethodName);
rtn &= this.enforceInitMethod == that.enforceInitMethod;
rtn &= ObjectUtils.nullSafeEquals(this.destroyMethodName, that.destroyMethodName);
rtn &= this.enforceDestroyMethod == that.enforceDestroyMethod;
rtn &= this.synthetic == that.synthetic;
rtn &= this.role == that.role;
return rtn && super.equals(other);
}

Expand Down