From 7a35b234963f21deeeb4dc5cee5669f9786fc2b2 Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Sun, 27 Oct 2024 12:14:00 +0700 Subject: [PATCH] Remove redundant condition --- .../boot/test/mock/mockito/QualifierDefinition.java | 2 +- .../boot/configurationprocessor/PropertyDescriptor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java index 9f46416ac3a5..d077a2af1ed8 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java @@ -81,7 +81,7 @@ public int hashCode() { } static QualifierDefinition forElement(AnnotatedElement element) { - if (element != null && element instanceof Field field) { + if (element instanceof Field field) { Set annotations = getQualifierAnnotations(field); if (!annotations.isEmpty()) { return new QualifierDefinition(field, annotations); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/PropertyDescriptor.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/PropertyDescriptor.java index 386f5b2992c0..1ff2ad08985c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/PropertyDescriptor.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/PropertyDescriptor.java @@ -150,7 +150,7 @@ private boolean isParentTheSame(MetadataGenerationEnvironment environment, Eleme } returnType = getTopLevelType(returnType); Element candidate = element; - while (candidate != null && candidate instanceof TypeElement) { + while (candidate instanceof TypeElement) { if (returnType.equals(getTopLevelType(candidate))) { return true; }