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

Use JSpecify's @⁠Nullable on main

This commit is contained in:
Sam Brannen 2025-02-11 16:17:32 +01:00
parent 18e31fcfba
commit e78e802647
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
View File

@ -18,6 +18,7 @@ package org.springframework.expression.spel;
import java.util.Set; import java.util.Set;
import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -30,7 +31,6 @@ import org.springframework.expression.spel.standard.SpelExpression;
import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.expression.spel.support.StandardTypeConverter; import org.springframework.expression.spel.support.StandardTypeConverter;
import org.springframework.expression.spel.support.StandardTypeLocator; import org.springframework.expression.spel.support.StandardTypeLocator;
import org.springframework.lang.Nullable;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@ -344,15 +344,13 @@ class VariableAndFunctionTests extends AbstractExpressionTests {
static class ArrayHolderConverter implements GenericConverter { static class ArrayHolderConverter implements GenericConverter {
@Nullable
@Override @Override
public Set<ConvertiblePair> getConvertibleTypes() { public @Nullable Set<ConvertiblePair> getConvertibleTypes() {
return Set.of(new ConvertiblePair(ArrayHolder.class, Object[].class)); return Set.of(new ConvertiblePair(ArrayHolder.class, Object[].class));
} }
@Nullable
@Override @Override
public String[] convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { public @Nullable String[] convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
return ((ArrayHolder) source).array(); return ((ArrayHolder) source).array();
} }
} }