From 6112c817a030d68c8a15f752dcc36c68e403e80b Mon Sep 17 00:00:00 2001 From: EruDev Date: Thu, 27 Aug 2020 17:13:58 +0800 Subject: [PATCH 1/2] Simplify code --- .../filter/AnnotationCustomizableTypeExcludeFilter.java | 5 +---- .../web/servlet/WebDriverContextCustomizerFactory.java | 5 +---- .../boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java | 2 +- .../boot/gradle/tasks/buildinfo/BuildInfoProperties.java | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java index d9670c1ce029..1e4c7aeffef9 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java @@ -61,10 +61,7 @@ protected boolean include(MetadataReader metadataReader, MetadataReaderFactory m metadataReaderFactory)) { return true; } - if (isUseDefaultFilters() && defaultInclude(metadataReader, metadataReaderFactory)) { - return true; - } - return false; + return isUseDefaultFilters() && defaultInclude(metadataReader, metadataReaderFactory); } protected boolean defaultInclude(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverContextCustomizerFactory.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverContextCustomizerFactory.java index 2c2daad574cb..e0b0b1d52c9c 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverContextCustomizerFactory.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverContextCustomizerFactory.java @@ -53,10 +53,7 @@ public boolean equals(Object obj) { if (obj == this) { return true; } - if (obj == null || obj.getClass() != getClass()) { - return false; - } - return true; + return obj != null && obj.getClass() == getClass(); } @Override diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java index 8da6fdbef5a3..5669c64d8ccb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java @@ -42,7 +42,7 @@ class UnresolvedDependenciesAnalyzer { void analyze(Set unresolvedDependencies) { this.dependenciesWithNoVersion = unresolvedDependencies.stream() - .map((unresolvedDependency) -> unresolvedDependency.getSelector()).filter(this::hasNoVersion) + .map(UnresolvedDependency::getSelector).filter(this::hasNoVersion) .collect(Collectors.toSet()); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java index 2a7255529583..94270c12122d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java @@ -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)); } /** From 3ecf6d5d1703f1c01bb04be411f96eb364c55a07 Mon Sep 17 00:00:00 2001 From: EruDev Date: Thu, 27 Aug 2020 17:38:14 +0800 Subject: [PATCH 2/2] Simplify code --- .../boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java index 5669c64d8ccb..8da6fdbef5a3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java @@ -42,7 +42,7 @@ class UnresolvedDependenciesAnalyzer { void analyze(Set unresolvedDependencies) { this.dependenciesWithNoVersion = unresolvedDependencies.stream() - .map(UnresolvedDependency::getSelector).filter(this::hasNoVersion) + .map((unresolvedDependency) -> unresolvedDependency.getSelector()).filter(this::hasNoVersion) .collect(Collectors.toSet()); }