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

ResolvableType.forInstance returns NONE for null instance 

Closes gh-28776
This commit is contained in:
Juergen Hoeller 2022-07-13 11:10:35 +02:00
parent de1b938e2e
commit a3e46a2db7
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-core/src/main/java/org/springframework/core/ResolvableType.java
View File

@ -221,9 +221,8 @@ public class ResolvableType implements Serializable {
/**
* Return the underlying source of the resolvable type. Will return a {@link Field},
* {@link MethodParameter} or {@link Type} depending on how the {@link ResolvableType}
* was constructed. With the exception of the {@link #NONE} constant, this method will
* never return {@code null}. This method is primarily to provide access to additional
* type information or meta-data that alternative JVM languages may provide.
* was constructed. This method is primarily to provide access to additional type
* information or meta-data that alternative JVM languages may provide.
*/
public Object getSource() {
Object source = (this.typeProvider != null ? this.typeProvider.getSource() : null);
@ -1103,20 +1102,20 @@ public class ResolvableType implements Serializable {
* convey generic information but if it implements {@link ResolvableTypeProvider} a
* more precise {@link ResolvableType} can be used than the simple one based on
* the {@link #forClass(Class) Class instance}.
* @param instance the instance
* @return a {@link ResolvableType} for the specified instance
* @param instance the instance (possibly {@code null})
* @return a {@link ResolvableType} for the specified instance,
* or {@code NONE} for {@code null}
* @since 4.2
* @see ResolvableTypeProvider
*/
public static ResolvableType forInstance(Object instance) {
Assert.notNull(instance, "Instance must not be null");
public static ResolvableType forInstance(@Nullable Object instance) {
if (instance instanceof ResolvableTypeProvider) {
ResolvableType type = ((ResolvableTypeProvider) instance).getResolvableType();
if (type != null) {
return type;
}
}
return ResolvableType.forClass(instance.getClass());
return (instance != null ? forClass(instance.getClass()) : NONE);
}
/**

8
spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
View File

@ -146,11 +146,9 @@ class ResolvableTypeTests {
assertThat(typeVariable.isAssignableFrom(raw)).isTrue();
}
@Test
void forInstanceMustNotBeNull() throws Exception {
assertThatIllegalArgumentException()
.isThrownBy(() -> ResolvableType.forInstance(null))
.withMessage("Instance must not be null");
@Test // gh-28776
void forInstanceNull() throws Exception {
assertThat(ResolvableType.forInstance(null)).isEqualTo(ResolvableType.NONE);
}
@Test