Skip to content

Commit 854b012

Browse files
committed
chore: replace List<@nullable Object> with List<?>
The latter is easier to read, and it forbids list.add(...) at the compile-time. See https://jspecify.dev/docs/user-guide/#wildcard-bounds
1 parent 7d02a6a commit 854b012

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/ArgumentsAccessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public interface ArgumentsAccessor {
198198
/**
199199
* Get all arguments in this accessor as an immutable list.
200200
*/
201-
List<@Nullable Object> toList();
201+
List<?> toList();
202202

203203
/**
204204
* Get the index of the current test invocation.

junit-jupiter-params/src/main/java/org/junit/jupiter/params/aggregator/DefaultArgumentsAccessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public int size() {
139139
}
140140

141141
@Override
142-
public List<@Nullable Object> toList() {
142+
public List<?> toList() {
143143
return Collections.unmodifiableList(Arrays.asList(this.arguments));
144144
}
145145

junit-platform-commons/src/main/java/org/junit/platform/commons/support/AnnotationSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ public static List<Field> findAnnotatedFields(Class<?> clazz, Class<? extends An
443443
* @see ReflectionSupport#tryToReadFieldValue(Field, Object)
444444
*/
445445
@API(status = MAINTAINED, since = "1.4")
446-
public static List<@Nullable Object> findAnnotatedFieldValues(Object instance,
446+
public static List<?> findAnnotatedFieldValues(Object instance,
447447
Class<? extends Annotation> annotationType) {
448448
Preconditions.notNull(instance, "instance must not be null");
449449

@@ -476,7 +476,7 @@ public static List<Field> findAnnotatedFields(Class<?> clazz, Class<? extends An
476476
* @see ReflectionSupport#tryToReadFieldValue(Field, Object)
477477
*/
478478
@API(status = MAINTAINED, since = "1.4")
479-
public static List<@Nullable Object> findAnnotatedFieldValues(Class<?> clazz,
479+
public static List<?> findAnnotatedFieldValues(Class<?> clazz,
480480
Class<? extends Annotation> annotationType) {
481481

482482
List<Field> fields = findAnnotatedFields(clazz, annotationType, ModifierSupport::isStatic,

junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ public static <T> Try<Object> tryToReadFieldValue(Class<T> clazz, String fieldNa
656656
* @return an immutable list of the values of the specified fields; never
657657
* {@code null} but may be empty or contain {@code null} entries
658658
*/
659-
public static List<@Nullable Object> readFieldValues(List<Field> fields, @Nullable Object instance) {
659+
public static List<?> readFieldValues(List<Field> fields, @Nullable Object instance) {
660660
return readFieldValues(fields, instance, field -> true);
661661
}
662662

@@ -673,7 +673,7 @@ public static <T> Try<Object> tryToReadFieldValue(Class<T> clazz, String fieldNa
673673
* @return an immutable list of the values of the specified fields; never
674674
* {@code null} but may be empty or contain {@code null} entries
675675
*/
676-
public static List<@Nullable Object> readFieldValues(List<Field> fields, @Nullable Object instance,
676+
public static List<?> readFieldValues(List<Field> fields, @Nullable Object instance,
677677
Predicate<Field> predicate) {
678678
Preconditions.notNull(fields, "fields list must not be null");
679679
Preconditions.notNull(predicate, "Predicate must not be null");

0 commit comments

Comments
 (0)