Merge branch '3.3.x'

Closes gh-42917

Author: snicoll

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<Annotation> annotations = getQualifierAnnotations(field);
 			if (!annotations.isEmpty()) {
 				return new QualifierDefinition(field, annotations);

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;
 			}