Skip to content

Commit e78e802

Browse files
committed
Use JSpecify's @⁠Nullable on main
1 parent 18e31fc commit e78e802

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

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

+3-5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.Set;
2020

21+
import org.jspecify.annotations.Nullable;
2122
import org.junit.jupiter.api.BeforeEach;
2223
import org.junit.jupiter.api.Nested;
2324
import org.junit.jupiter.api.Test;
@@ -30,7 +31,6 @@
3031
import org.springframework.expression.spel.support.StandardEvaluationContext;
3132
import org.springframework.expression.spel.support.StandardTypeConverter;
3233
import org.springframework.expression.spel.support.StandardTypeLocator;
33-
import org.springframework.lang.Nullable;
3434

3535
import static org.assertj.core.api.Assertions.assertThat;
3636
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -344,15 +344,13 @@ record ArrayHolder(String... array) {
344344

345345
static class ArrayHolderConverter implements GenericConverter {
346346

347-
@Nullable
348347
@Override
349-
public Set<ConvertiblePair> getConvertibleTypes() {
348+
public @Nullable Set<ConvertiblePair> getConvertibleTypes() {
350349
return Set.of(new ConvertiblePair(ArrayHolder.class, Object[].class));
351350
}
352351

353-
@Nullable
354352
@Override
355-
public String[] convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
353+
public @Nullable String[] convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
356354
return ((ArrayHolder) source).array();
357355
}
358356
}

0 commit comments

Comments
 (0)