Merge branch '3.2.x' into 3.3.x

Closes gh-42916

Author: snicoll

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -78,7 +78,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;
 			}