Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Specify nullability @⁠Contract for TypeDescriptor.array()

Browse Source
This commit is contained in:
Sam Brannen
2024-07-12 18:02:21 +02:00
parent 09d8e4458c
commit 59b9404956
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
View File

@@ -644,6 +644,7 @@ public class TypeDescriptor implements Serializable {
* @since 3.2.1
*/
@Nullable
@Contract("!null -> !null; null -> null")
public static TypeDescriptor array(@Nullable TypeDescriptor elementTypeDescriptor) {
if (elementTypeDescriptor == null) {
return null;

1
spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
View File

@@ -389,7 +389,6 @@ public abstract class ReflectionHelper {
// FunctionReference#executeFunctionViaMethodHandle().
Class<?> varargsComponentClass = ClassUtils.resolvePrimitiveIfNecessary(varargsArrayClass.componentType());
TypeDescriptor varargsArrayType = TypeDescriptor.array(TypeDescriptor.valueOf(varargsComponentClass));
Assert.state(varargsArrayType != null, "Array type must not be null for a varargs array");
TypeDescriptor varargsComponentType = varargsArrayType.getElementTypeDescriptor();
Assert.state(varargsComponentType != null, "Component type must not be null for a varargs array");