root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2024-10-18 10:47:52 -07:00
parent d9539783d2
commit 168d82e138
13 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java vendored
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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