From bb2e3ce6d13e14fb8c8aeac530859b06635eace0 Mon Sep 17 00:00:00 2001 From: Qimiao Chen Date: Thu, 21 Nov 2019 22:26:42 +0800 Subject: [PATCH] Polish AbstractBeanDefinition Closes gh-24048 --- .../support/AbstractBeanDefinition.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java index b1c6691d09..6ffddcc130 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java @@ -1162,28 +1162,28 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess } 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); }