Skip to content

Commit 1e12942

Browse files
committed
Fix some NullAway wildcard warnings
Signed-off-by: Manu Sridharan <msridhar@gmail.com>
1 parent ffe6b73 commit 1e12942

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/CachingJupiterConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.function.Supplier;
3434

3535
import org.apiguardian.api.API;
36+
import org.jspecify.annotations.Nullable;
3637
import org.junit.jupiter.api.ClassOrderer;
3738
import org.junit.jupiter.api.Constants;
3839
import org.junit.jupiter.api.DisplayNameGenerator;
@@ -73,7 +74,8 @@ public Optional<String> getRawConfigurationParameter(String key) {
7374
}
7475

7576
@Override
76-
public <T> Optional<T> getRawConfigurationParameter(String key, Function<? super String, ? extends T> transformer) {
77+
public <T> Optional<T> getRawConfigurationParameter(String key,
78+
Function<? super String, ? extends @Nullable T> transformer) {
7779
return delegate.getRawConfigurationParameter(key, transformer);
7880
}
7981

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/DefaultJupiterConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import java.util.function.Supplier;
4343

4444
import org.apiguardian.api.API;
45+
import org.jspecify.annotations.Nullable;
4546
import org.junit.jupiter.api.ClassOrderer;
4647
import org.junit.jupiter.api.DisplayNameGenerator;
4748
import org.junit.jupiter.api.MethodOrderer;
@@ -160,7 +161,8 @@ public Optional<String> getRawConfigurationParameter(String key) {
160161
}
161162

162163
@Override
163-
public <T> Optional<T> getRawConfigurationParameter(String key, Function<? super String, ? extends T> transformer) {
164+
public <T> Optional<T> getRawConfigurationParameter(String key,
165+
Function<? super String, ? extends @Nullable T> transformer) {
164166
return configurationParameters.get(key, transformer);
165167
}
166168

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/config/JupiterConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.function.Supplier;
1919

2020
import org.apiguardian.api.API;
21+
import org.jspecify.annotations.Nullable;
2122
import org.junit.jupiter.api.ClassOrderer;
2223
import org.junit.jupiter.api.DisplayNameGenerator;
2324
import org.junit.jupiter.api.MethodOrderer;
@@ -41,7 +42,8 @@ public interface JupiterConfiguration {
4142

4243
Optional<String> getRawConfigurationParameter(String key);
4344

44-
<T> Optional<T> getRawConfigurationParameter(String key, Function<? super String, ? extends T> transformer);
45+
<T> Optional<T> getRawConfigurationParameter(String key,
46+
Function<? super String, ? extends @Nullable T> transformer);
4547

4648
boolean isParallelExecutionEnabled();
4749

0 commit comments

Comments
 (0)