Polish

philwebb · philwebb · commit 168d82e1380d · 2024-10-18T10:47:52.000-07:00
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapter.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapter.java
@@ -58,8 +58,8 @@ public final Validator getTarget() {
 	}
 
 	@Override
-	public boolean supports(Class<?> clazz) {
-		return this.target.supports(clazz);
+	public boolean supports(Class<?> type) {
+		return this.target.supports(type);
 	}
 
 	@Override
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java
@@ -178,7 +178,7 @@ public boolean isClosed() {
 		}
 
 		@Override
-		public <T> T unwrap(Class<T> clazz) {
+		public <T> T unwrap(Class<T> type) {
 			throw new UnsupportedOperationException();
 		}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidatorAdapterTests.java
@@ -157,8 +157,8 @@ static class Wrapper implements SmartValidator {
 			}
 
 			@Override
-			public boolean supports(Class<?> clazz) {
-				return this.delegate.supports(clazz);
+			public boolean supports(Class<?> type) {
+				return this.delegate.supports(type);
 			}
 
 			@Override
diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/AdditionalHttpMessageConverter.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/AdditionalHttpMessageConverter.java
@@ -27,18 +27,18 @@
 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 {
 	}
 
diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/web/servlet/springmvc/messageconverters/AdditionalHttpMessageConverter.kt b/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) {
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleService.java b/spring-boot-project/spring-boot-test-autoconfigure/src/dockerTest/java/org/springframework/boot/test/autoconfigure/data/neo4j/ExampleService.java
@@ -34,8 +34,8 @@ public ExampleService(Neo4jTemplate neo4jTemplate) {
 		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;
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java
@@ -115,8 +115,8 @@ private void addDefinition(AnnotatedElement element, Definition definition, Stri
 
 	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)
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
@@ -132,8 +132,8 @@ void load() {
 
 	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) {
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonMixinModuleEntries.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jackson/JsonMixinModuleEntries.java
@@ -91,12 +91,11 @@ private static void registerMixinClass(Builder builder, Class<?> mixinClass) {
 			.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 void doWithEntry(ClassLoader classLoader, BiConsumer<Class<?>, Class<?>>
 				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);
 	}
 
 	/**
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java b/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
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandlerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandlerTests.java
@@ -241,8 +241,8 @@ private Validator getMapValidator() {
 		return new Validator() {
 
 			@Override
-			public boolean supports(Class<?> clazz) {
-				return ExampleWithMap.class == clazz;
+			public boolean supports(Class<?> type) {
+				return ExampleWithMap.class == type;
 
 			}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BindValidationFailureAnalyzerTests.java
@@ -202,7 +202,7 @@ public void validate(Object target, Errors errors) {
 		}
 
 		@Override
-		public boolean supports(Class<?> clazz) {
+		public boolean supports(Class<?> type) {
 			return true;
 		}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
@@ -77,17 +77,17 @@ static Stream<? extends Arguments> databaseClassIsOfRequiredType() {
 						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));
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ public final Validator getTarget() {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- public boolean supports(Class<?> clazz) {`
`62`		`- return this.target.supports(clazz);`
	`61`	`+ public boolean supports(Class<?> type) {`
	`62`	`+ return this.target.supports(type);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ public boolean isClosed() {`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`@Override`
`181`		`- public <T> T unwrap(Class<T> clazz) {`
	`181`	`+ public <T> T unwrap(Class<T> type) {`
`182`	`182`	`throw new UnsupportedOperationException();`
`183`	`183`	`}`
`184`	`184`
Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,8 @@ static class Wrapper implements SmartValidator {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`@Override`
`160`		`- public boolean supports(Class<?> clazz) {`
`161`		`- return this.delegate.supports(clazz);`
	`160`	`+ public boolean supports(Class<?> type) {`
	`161`	`+ return this.delegate.supports(type);`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -27,18 +27,18 @@`
`27`	`27`	`class AdditionalHttpMessageConverter extends AbstractHttpMessageConverter<Object> {`
`28`	`28`
`29`	`29`	`@Override`
`30`		`- protected boolean supports(Class<?> clazz) {`
	`30`	`+ protected boolean supports(Class<?> type) {`
`31`	`31`	`return false;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
`35`		`- protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage)`
	`35`	`+ protected Object readInternal(Class<?> type, HttpInputMessage inputMessage)`
`36`	`36`	`throws IOException, HttpMessageNotReadableException {`
`37`	`37`	`return null;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
`41`		`- protected void writeInternal(Object t, HttpOutputMessage outputMessage)`
	`41`	`+ protected void writeInternal(Object instance, HttpOutputMessage outputMessage)`
`42`	`42`	`throws IOException, HttpMessageNotWritableException {`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -25,17 +25,17 @@ import java.io.IOException`
`25`	`25`
`26`	`26`	`open class AdditionalHttpMessageConverter : AbstractHttpMessageConverter<Any>() {`
`27`	`27`
`28`		`- override fun supports(clazz: Class<*>): Boolean {`
	`28`	`+ override fun supports(type: Class<*>): Boolean {`
`29`	`29`	`return false`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Throws(IOException::class, HttpMessageNotReadableException::class)`
`33`		`- override fun readInternal(clazz: Class<*>, inputMessage: HttpInputMessage): Any {`
	`33`	`+ override fun readInternal(type: Class<*>, inputMessage: HttpInputMessage): Any {`
`34`	`34`	`return Any()`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Throws(IOException::class, HttpMessageNotWritableException::class)`
`38`		`- override fun writeInternal(t: Any, outputMessage: HttpOutputMessage) {`
	`38`	`+ override fun writeInternal(instance: Any, outputMessage: HttpOutputMessage) {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ public ExampleService(Neo4jTemplate neo4jTemplate) {`
`34`	`34`	`this.neo4jTemplate = neo4jTemplate;`
`35`	`35`	`}`
`36`	`36`
`37`		`- public boolean hasNode(Class<?> clazz) {`
`38`		`- return this.neo4jTemplate.count(clazz) == 1;`
	`37`	`+ public boolean hasNode(Class<?> type) {`
	`38`	`+ return this.neo4jTemplate.count(type) == 1;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,12 +91,11 @@ private static void registerMixinClass(Builder builder, Class<?> mixinClass) {`
`91`	`91`	`.from(mixinClass, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY)`
`92`	`92`	`.get(JsonMixin.class);`
`93`	`93`	`Class<?>[] types = annotation.getClassArray("type");`
`94`		`- Assert.notEmpty(types,`
`95`		`- "@JsonMixin annotation on class '" + mixinClass.getName() + "' does not specify any types");`
`96`		`- for (Class<?> targetType : types) {`
`97`		`- builder.and(targetType, mixinClass);`
	`94`	`+ Assert.state(!ObjectUtils.isEmpty(types),`
	`95`	`+ () -> "@JsonMixin annotation on class '" + mixinClass.getName() + "' does not specify any types");`
	`96`	`+ for (Class<?> type : types) {`
	`97`	`+ builder.and(type, mixinClass);`
`98`	`98`	`}`
`99`		`-`
`100`	`99`	`}`
`101`	`100`
`102`	`101`	`/**`
`@@ -110,8 +109,8 @@ public void doWithEntry(ClassLoader classLoader, BiConsumer<Class<?>, Class<?>>`
`110`	`109`	`resolveClassNameIfNecessary(mixin, classLoader)));`
`111`	`110`	`}`
`112`	`111`
`113`		`- private Class<?> resolveClassNameIfNecessary(Object type, ClassLoader classLoader) {`
`114`		`- return (type instanceof Class<?> clazz) ? clazz : ClassUtils.resolveClassName((String) type, classLoader);`
	`112`	`+ private Class<?> resolveClassNameIfNecessary(Object nameOrType, ClassLoader classLoader) {`
	`113`	`+ return (nameOrType instanceof Class<?> type) ? type : ClassUtils.resolveClassName((String) nameOrType, classLoader);`
`115`	`114`	`}`
`116`	`115`
`117`	`116`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,9 @@ public enum JavaVersion {`
`83`	`83`
`84`	`84`	`private final boolean available;`
`85`	`85`
`86`		`- JavaVersion(String name, Class<?> clazz, String methodName) {`
	`86`	`+ JavaVersion(String name, Class<?> versionSpecificClass, String versionSpecificMethod) {`
`87`	`87`	`this.name = name;`
`88`		`- this.available = ClassUtils.hasMethod(clazz, methodName);`
	`88`	`+ this.available = ClassUtils.hasMethod(versionSpecificClass, versionSpecificMethod);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Override`