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

Merge pull request #23111 from EruDev

Browse Source 
* pr/23111:
  Polish "Simplify code"
  Simplify code

Closes gh-23111
This commit is contained in:
Stephane Nicoll
2020-09-01 10:11:39 +02:00
parent ce169c4d51 5a86162ff3
commit da3f84f306
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -61,10 +61,7 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud
metadataReaderFactory)) {
return true;
}
if (isUseDefaultFilters() && defaultInclude(metadataReader, metadataReaderFactory)) {
return true;
}
return false;
return isUseDefaultFilters() && defaultInclude(metadataReader, metadataReaderFactory);
}
protected boolean defaultInclude(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)

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.set(project.provider(() -> project.getVersion().toString()));
this.name = project.getObjects().property(String.class);
this.name.set(project.provider(() -> project.getName()));
this.name.set(project.provider(project::getName));
}
/**