Skip to content

Commit 3c555a2

Browse files
committed
Add nullability annotations to tests in module/spring-boot-reactor-netty
See gh-47263
1 parent 3466271 commit 3c555a2

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

module/spring-boot-reactor-netty/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,14 @@ dependencies {
4343
testImplementation("io.projectreactor:reactor-test")
4444
testImplementation("org.springframework:spring-webflux")
4545

46+
testCompileOnly("com.google.code.findbugs:jsr305")
47+
4648
testRuntimeOnly("ch.qos.logback:logback-classic")
4749
testRuntimeOnly("org.eclipse.jetty:jetty-client")
4850
testRuntimeOnly("org.eclipse.jetty.http2:jetty-http2-client")
4951
testRuntimeOnly("org.eclipse.jetty.http2:jetty-http2-client-transport")
5052
}
53+
54+
tasks.named("compileTestJava") {
55+
options.nullability.checking = "tests"
56+
}

module/spring-boot-reactor-netty/src/test/java/org/springframework/boot/reactor/netty/NettyReactiveWebServerFactoryTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import io.netty.channel.Channel;
2525
import org.awaitility.Awaitility;
26+
import org.jspecify.annotations.Nullable;
2627
import org.junit.jupiter.api.Disabled;
2728
import org.junit.jupiter.api.Test;
2829
import org.mockito.InOrder;
@@ -246,16 +247,16 @@ static class NoPortNettyReactiveWebServerFactory extends NettyReactiveWebServerF
246247

247248
@Override
248249
NettyWebServer createNettyWebServer(HttpServer httpServer, ReactorHttpHandlerAdapter handlerAdapter,
249-
Duration lifecycleTimeout, Shutdown shutdown) {
250+
@Nullable Duration lifecycleTimeout, Shutdown shutdown) {
250251
return new NoPortNettyWebServer(httpServer, handlerAdapter, lifecycleTimeout, shutdown);
251252
}
252253

253254
}
254255

255256
static class NoPortNettyWebServer extends NettyWebServer {
256257

257-
NoPortNettyWebServer(HttpServer httpServer, ReactorHttpHandlerAdapter handlerAdapter, Duration lifecycleTimeout,
258-
Shutdown shutdown) {
258+
NoPortNettyWebServer(HttpServer httpServer, ReactorHttpHandlerAdapter handlerAdapter,
259+
@Nullable Duration lifecycleTimeout, @Nullable Shutdown shutdown) {
259260
super(httpServer, handlerAdapter, lifecycleTimeout, shutdown, null);
260261
}
261262

module/spring-boot-reactor-netty/src/test/java/org/springframework/boot/reactor/netty/autoconfigure/NettyReactiveWebServerFactoryCustomizerTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class NettyReactiveWebServerFactoryCustomizerTests {
6363
private NettyReactiveWebServerFactoryCustomizer customizer;
6464

6565
@Captor
66+
@SuppressWarnings("NullAway.Init")
6667
private ArgumentCaptor<NettyServerCustomizer> customizerCaptor;
6768

6869
@BeforeEach
@@ -196,6 +197,7 @@ private void verifyHttp2MaxHeaderSize(NettyReactiveWebServerFactory factory, lon
196197
NettyServerCustomizer serverCustomizer = this.customizerCaptor.getAllValues().get(0);
197198
HttpServer httpServer = serverCustomizer.apply(HttpServer.create());
198199
Http2SettingsSpec decoder = httpServer.configuration().http2SettingsSpec();
200+
assertThat(decoder).isNotNull();
199201
assertThat(decoder.maxHeaderListSize()).isEqualTo(expected);
200202
}
201203

0 commit comments

Comments
 (0)