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

Simplify code 

See gh-23111
This commit is contained in:
EruDev 2020-08-27 17:13:58 +08:00 committed by Stephane Nicoll
parent ce169c4d51
commit ffc577b499
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,10 +61,7 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud
metadataReaderFactory)) { metadataReaderFactory)) {
return true; return true;
} }
if (isUseDefaultFilters() && defaultInclude(metadataReader, metadataReaderFactory)) { return isUseDefaultFilters() && defaultInclude(metadataReader, metadataReaderFactory);
return true;
}
return false;
} }
protected boolean defaultInclude(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) protected boolean defaultInclude(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)

5
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverContextCustomizerFactory.java
View File

@ -53,10 +53,7 @@ class WebDriverContextCustomizerFactory implements ContextCustomizerFactory {
if (obj == this) { if (obj == this) {
return true; return true;
} }
if (obj == null || obj.getClass() != getClass()) { return obj != null && obj.getClass() == getClass();
return false;
}
return true;
} }
@Override @Override

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java
View File

@ -56,7 +56,7 @@ public class BuildInfoProperties implements Serializable {
this.version = project.getObjects().property(String.class); this.version = project.getObjects().property(String.class);
this.version.set(project.provider(() -> project.getVersion().toString())); this.version.set(project.provider(() -> project.getVersion().toString()));
this.name = project.getObjects().property(String.class); this.name = project.getObjects().property(String.class);
this.name.set(project.provider(() -> project.getName())); this.name.set(project.provider(project::getName));
} }
/** /**