Merge branch '2.7.x' into 3.0.x

Author: philwebb

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-instance.xml

@@ -2,19 +2,15 @@
 <hazelcast-client xmlns="http://www.hazelcast.com/schema/client-config"
 				  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 				  xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-5.0.xsd">
-
 	<instance-name>spring-boot</instance-name>
-	
 	<connection-strategy>
 		<connection-retry>
 			<cluster-connect-timeout-millis>60000</cluster-connect-timeout-millis>
 		</connection-retry>
 	</connection-strategy>
-	
 	<network>
 		<cluster-members>
 			<address>${address}</address>
 		</cluster-members>
 	</network>
-
 </hazelcast-client>

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBinder.java

@@ -135,7 +135,6 @@ private IgnoreTopLevelConverterNotFoundBindHandler getHandler() {
 				: new IgnoreTopLevelConverterNotFoundBindHandler();
 	}
 
-	@SuppressWarnings("unchecked")
 	private List<Validator> getValidators(Bindable<?> target) {
 		List<Validator> validators = new ArrayList<>(3);
 		if (this.configurationPropertiesValidator != null) {
@@ -144,15 +143,23 @@ private List<Validator> getValidators(Bindable<?> target) {
 		if (this.jsr303Present && target.getAnnotation(Validated.class) != null) {
 			validators.add(getJsr303Validator());
 		}
+		Validator selfValidator = getSelfValidator(target);
+		if (selfValidator != null) {
+			validators.add(selfValidator);
+		}
+		return validators;
+	}
+
+	private Validator getSelfValidator(Bindable<?> target) {
 		if (target.getValue() != null) {
-			if (target.getValue().get() instanceof Validator validator) {
-				validators.add(validator);
-			}
+			Object value = target.getValue().get();
+			return (value instanceof Validator validator) ? validator : null;
 		}
-		else if (Validator.class.isAssignableFrom(target.getType().resolve())) {
-			validators.add(new SelfValidatingConstructorBoundBindableValidator((Bindable<? extends Validator>) target));
+		Class<?> type = target.getType().resolve();
+		if (Validator.class.isAssignableFrom(type)) {
+			return new SelfValidatingConstructorBoundBindableValidator(type);
 		}
-		return validators;
+		return null;
 	}
 
 	private Validator getJsr303Validator() {
@@ -263,15 +270,15 @@ public ConfigurationPropertiesBinder getObject() throws Exception {
 	 */
 	static class SelfValidatingConstructorBoundBindableValidator implements Validator {
 
-		private final Bindable<? extends Validator> bindable;
+		private final Class<?> type;
 
-		SelfValidatingConstructorBoundBindableValidator(Bindable<? extends Validator> bindable) {
-			this.bindable = bindable;
+		SelfValidatingConstructorBoundBindableValidator(Class<?> type) {
+			this.type = type;
 		}
 
 		@Override
-		public boolean supports(Class<?> clazz) {
-			return clazz.isAssignableFrom(this.bindable.getType().resolve());
+		public boolean supports(Class<?> candidate) {
+			return candidate.isAssignableFrom(this.type);
 		}
 
 		@Override