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

Use logical 'and' instead of bitwise 'and'

Browse Source 
Closes gh-8198
This commit is contained in:
Johnny Lim
2017-02-06 11:01:18 +09:00
committed by Stephane Nicoll
parent b4858882f3
commit 0adab8a2be
11 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/Definition.java
View File

@@ -97,11 +97,11 @@ abstract class Definition {
}
Definition other = (Definition) obj;
boolean result = true;
result &= ObjectUtils.nullSafeEquals(this.name, other.name);
result &= ObjectUtils.nullSafeEquals(this.reset, other.reset);
result &= ObjectUtils.nullSafeEquals(this.proxyTargetAware,
result = result && ObjectUtils.nullSafeEquals(this.name, other.name);
result = result && ObjectUtils.nullSafeEquals(this.reset, other.reset);
result = result && ObjectUtils.nullSafeEquals(this.proxyTargetAware,
other.proxyTargetAware);
result &= ObjectUtils.nullSafeEquals(this.qualifier, other.qualifier);
result = result && ObjectUtils.nullSafeEquals(this.qualifier, other.qualifier);
return result;
}

8
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java
View File

@@ -120,10 +120,10 @@ class MockDefinition extends Definition {
}
MockDefinition other = (MockDefinition) obj;
boolean result = super.equals(obj);
result &= ObjectUtils.nullSafeEquals(this.typeToMock, other.typeToMock);
result &= ObjectUtils.nullSafeEquals(this.extraInterfaces, other.extraInterfaces);
result &= ObjectUtils.nullSafeEquals(this.answer, other.answer);
result &= this.serializable == other.serializable;
result = result && ObjectUtils.nullSafeEquals(this.typeToMock, other.typeToMock);
result = result && ObjectUtils.nullSafeEquals(this.extraInterfaces, other.extraInterfaces);
result = result && ObjectUtils.nullSafeEquals(this.answer, other.answer);
result = result && this.serializable == other.serializable;
return result;
}

2
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java
View File

@@ -65,7 +65,7 @@ class SpyDefinition extends Definition {
}
SpyDefinition other = (SpyDefinition) obj;
boolean result = super.equals(obj);
result &= ObjectUtils.nullSafeEquals(this.typeToSpy, other.typeToSpy);
result = result && ObjectUtils.nullSafeEquals(this.typeToSpy, other.typeToSpy);
return result;
}