Polish

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapter.java

@@ -58,8 +58,8 @@ public class ValidatorAdapter implements SmartValidator, ApplicationContextAware
 	}
 
 	@Override
-	public boolean supports(Class<?> clazz) {
-		return this.target.supports(clazz);
+	public boolean supports(Class<?> type) {
+		return this.target.supports(type);
 	}
 
 	@Override

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java

@@ -178,7 +178,7 @@ public class MockCachingProvider implements CachingProvider {
 		}
 
 		@Override
-		public <T> T unwrap(Class<T> clazz) {
+		public <T> T unwrap(Class<T> type) {
 			throw new UnsupportedOperationException();
 		}
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java

@@ -157,8 +157,8 @@ class ValidatorAdapterTests {
 			}
 
 			@Override
-			public boolean supports(Class<?> clazz) {
-				return this.delegate.supports(clazz);
+			public boolean supports(Class<?> type) {
+				return this.delegate.supports(type);
 			}
 
 			@Override

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/AdditionalHttpMessageConverter.java

@@ -27,18 +27,18 @@ import org.springframework.http.converter.HttpMessageNotWritableException;
 class AdditionalHttpMessageConverter extends AbstractHttpMessageConverter<Object> {
 
 	@Override
-	protected boolean supports(Class<?> clazz) {
+	protected boolean supports(Class<?> type) {
 		return false;
 	}
 
 	@Override
-	protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)
+	protected Object readInternal(Class<?> type, HttpInputMessage inputMessage)
 			throws IOException, HttpMessageNotReadableException {
 		return null;
 	}
 
 	@Override
-	protected void writeInternal(Object t, HttpOutputMessage outputMessage)
+	protected void writeInternal(Object instance, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
 	}
 

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/AdditionalHttpMessageConverter.kt

@@ -25,17 +25,17 @@ import java.io.IOException
 
 open class AdditionalHttpMessageConverter : AbstractHttpMessageConverter<Any>() {
 
-	override fun supports(clazz: Class<*>): Boolean {
+	override fun supports(type: Class<*>): Boolean {
 		return false
 	}
 
 	@Throws(IOException::class, HttpMessageNotReadableException::class)
-	override fun readInternal(clazz: Class<*>, inputMessage: HttpInputMessage): Any {
+	override fun readInternal(type: Class<*>, inputMessage: HttpInputMessage): Any {
 		return Any()
 	}
 
 	@Throws(IOException::class, HttpMessageNotWritableException::class)
-	override fun writeInternal(t: Any, outputMessage: HttpOutputMessage) {
+	override fun writeInternal(instance: Any, outputMessage: HttpOutputMessage) {
 	}
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleService.java

@@ -34,8 +34,8 @@ public class ExampleService {
 		this.neo4jTemplate = neo4jTemplate;
 	}
 
-	public boolean hasNode(Class<?> clazz) {
-		return this.neo4jTemplate.count(clazz) == 1;
+	public boolean hasNode(Class<?> type) {
+		return this.neo4jTemplate.count(type) == 1;
 	}
 
 }

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

@@ -115,8 +115,8 @@ class DefinitionsParser {
 
 	private Set<ResolvableType> getOrDeduceTypes(AnnotatedElement element, Class<?>[] value, Class<?> source) {
 		Set<ResolvableType> types = new LinkedHashSet<>();
-		for (Class<?> clazz : value) {
-			types.add(ResolvableType.forClass(clazz));
+		for (Class<?> type : value) {
+			types.add(ResolvableType.forClass(type));
 		}
 		if (types.isEmpty() && element instanceof Field field) {
 			types.add((field.getGenericType() instanceof TypeVariable) ? ResolvableType.forField(field, source)

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java

@@ -132,8 +132,8 @@ class BeanDefinitionLoader {
 
 	private void load(Object source) {
 		Assert.notNull(source, "Source must not be null");
-		if (source instanceof Class<?> clazz) {
-			load(clazz);
+		if (source instanceof Class<?> type) {
+			load(type);
 			return;
 		}
 		if (source instanceof Resource resource) {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonMixinModuleEntries.java

@@ -91,12 +91,11 @@ public final class JsonMixinModuleEntries {
 			.from(mixinClass, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY)
 			.get(JsonMixin.class);
 		Class<?>[] types = annotation.getClassArray("type");
-		Assert.notEmpty(types,
-				"@JsonMixin annotation on class '" + mixinClass.getName() + "' does not specify any types");
-		for (Class<?> targetType : types) {
-			builder.and(targetType, mixinClass);
+		Assert.state(!ObjectUtils.isEmpty(types),
+				() -> "@JsonMixin annotation on class '" + mixinClass.getName() + "' does not specify any types");
+		for (Class<?> type : types) {
+			builder.and(type, mixinClass);
 		}
-
 	}
 
 	/**
@@ -110,8 +109,8 @@ public final class JsonMixinModuleEntries {
 				resolveClassNameIfNecessary(mixin, classLoader)));
 	}
 
-	private Class<?> resolveClassNameIfNecessary(Object type, ClassLoader classLoader) {
-		return (type instanceof Class<?> clazz) ? clazz : ClassUtils.resolveClassName((String) type, classLoader);
+	private Class<?> resolveClassNameIfNecessary(Object nameOrType, ClassLoader classLoader) {
+		return (nameOrType instanceof Class<?> type) ? type : ClassUtils.resolveClassName((String) nameOrType, classLoader);
 	}
 
 	/**

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java

@@ -83,9 +83,9 @@ public enum JavaVersion {
 
 	private final boolean available;
 
-	JavaVersion(String name, Class<?> clazz, String methodName) {
+	JavaVersion(String name, Class<?> versionSpecificClass, String versionSpecificMethod) {
 		this.name = name;
-		this.available = ClassUtils.hasMethod(clazz, methodName);
+		this.available = ClassUtils.hasMethod(versionSpecificClass, versionSpecificMethod);
 	}
 
 	@Override

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandlerTests.java

@@ -241,8 +241,8 @@ class ValidationBindHandlerTests {
 		return new Validator() {
 
 			@Override
-			public boolean supports(Class<?> clazz) {
-				return ExampleWithMap.class == clazz;
+			public boolean supports(Class<?> type) {
+				return ExampleWithMap.class == type;
 
 			}
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java

@@ -202,7 +202,7 @@ class BindValidationFailureAnalyzerTests {
 		}
 
 		@Override
-		public boolean supports(Class<?> clazz) {
+		public boolean supports(Class<?> type) {
 			return true;
 		}
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java

@@ -77,17 +77,17 @@ class DatabaseDriverClassNameTests {
 						DatabaseDriver::getXaDataSourceClassName));
 	}
 
-	private static Stream<? extends Arguments> argumentsForType(Class<?> clazz,
+	private static Stream<? extends Arguments> argumentsForType(Class<?> type,
 			Function<DatabaseDriver, String> classNameExtractor) {
-		return argumentsForType(clazz, (databaseDriver) -> true, classNameExtractor);
+		return argumentsForType(type, (databaseDriver) -> true, classNameExtractor);
 	}
 
-	private static Stream<? extends Arguments> argumentsForType(Class<?> clazz, Predicate<DatabaseDriver> predicate,
+	private static Stream<? extends Arguments> argumentsForType(Class<?> type, Predicate<DatabaseDriver> predicate,
 			Function<DatabaseDriver, String> classNameExtractor) {
 		return Stream.of(DatabaseDriver.values())
 			.filter((databaseDriver) -> !EXCLUDED_DRIVERS.contains(databaseDriver))
 			.filter(predicate)
-			.map((databaseDriver) -> Arguments.of(databaseDriver, classNameExtractor.apply(databaseDriver), clazz));
+			.map((databaseDriver) -> Arguments.of(databaseDriver, classNameExtractor.apply(databaseDriver), type));
 	}
 
 }