root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Polish 'Simplify some code' 

See gh-18438
This commit is contained in:
Phillip Webb 2019-10-01 22:07:36 -07:00
parent e6b45de41e
commit b65ba60980
8 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java
View File

@ -56,7 +56,7 @@ class OverrideAutoConfigurationContextCustomizerFactory implements ContextCustom
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
return (obj != null && obj.getClass() == getClass()); return (obj != null) && (obj.getClass() == getClass());
} }
@Override @Override

4
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizer.java
View File

@ -71,8 +71,8 @@ class TypeExcludeFiltersContextCustomizer implements ContextCustomizer {
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
return (obj != null && getClass() == obj.getClass() return (obj != null) && (getClass() == obj.getClass())
&& this.filters.equals(((TypeExcludeFiltersContextCustomizer) obj).filters)); && this.filters.equals(((TypeExcludeFiltersContextCustomizer) obj).filters);
} }
@Override @Override

4
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizer.java
View File

@ -57,8 +57,8 @@ class PropertyMappingContextCustomizer implements ContextCustomizer {
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
return (obj != null && getClass() == obj.getClass() return (obj != null) && (getClass() == obj.getClass())
&& this.propertySource.equals(((PropertyMappingContextCustomizer) obj).propertySource)); && this.propertySource.equals(((PropertyMappingContextCustomizer) obj).propertySource);
} }
@Override @Override

5
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java
View File

@ -37,10 +37,7 @@ class ExcludeFilterContextCustomizer implements ContextCustomizer {
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == this) { return (obj != null) && (getClass() == obj.getClass());
return true;
}
return obj != null && getClass() == obj.getClass();
} }
@Override @Override

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java
View File

@ -80,7 +80,7 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
return obj != null && obj.getClass() == getClass(); return (obj != null) && (getClass() == obj.getClass());
} }
@Override @Override

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java
View File

@ -208,8 +208,8 @@ class OutputCapture implements CapturedOutput {
} }
private static PrintStream getSystemStream(PrintStream printStream) { private static PrintStream getSystemStream(PrintStream printStream) {
if (printStream instanceof PrintStreamCapture) { while (printStream instanceof PrintStreamCapture) {
return ((PrintStreamCapture) printStream).getParent(); printStream = ((PrintStreamCapture) printStream).getParent();
} }
return printStream; return printStream;
} }

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java
View File

@ -78,7 +78,7 @@ class TestRestTemplateContextCustomizer implements ContextCustomizer {
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
return obj != null && obj.getClass() == getClass(); return (obj != null) && (obj.getClass() == getClass());
} }
@Override @Override

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizer.java
View File

@ -79,7 +79,7 @@ class WebTestClientContextCustomizer implements ContextCustomizer {
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
return (obj != null && obj.getClass() == getClass()); return (obj != null) && (obj.getClass() == getClass());
} }
@Override @Override