From 1c8f7278645e323495021dde7476a27e7c47b9cb Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 8 Aug 2019 14:35:29 +0200 Subject: [PATCH] Polish "Simplify if statements" See gh-17785 --- .../boot/configurationprocessor/metadata/Metadata.java | 10 ++++++++-- .../boot/loader/tools/MainClassFinder.java | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java index d49030af99..69e3d914cf 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java @@ -157,7 +157,10 @@ public final class Metadata { if (this.deprecation == null && itemMetadata.getDeprecation() != null) { return false; } - return this.deprecation == null || this.deprecation.equals(itemMetadata.getDeprecation()); + if (this.deprecation != null && !this.deprecation.equals(itemMetadata.getDeprecation())) { + return false; + } + return true; } public MetadataItemCondition ofType(Class dataType) { @@ -339,7 +342,10 @@ public final class Metadata { if (this.value != null && !this.value.equals(valueHint.getValue())) { return false; } - return this.description == null || this.description.equals(valueHint.getDescription()); + if (this.description != null && !this.description.equals(valueHint.getDescription())) { + return false; + } + return true; } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java index cfe20c14b7..a448883620 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java @@ -381,7 +381,10 @@ public abstract class MainClassFinder { return false; } MainClass other = (MainClass) obj; - return this.name.equals(other.name); + if (!this.name.equals(other.name)) { + return false; + } + return true; } @Override