Merge branch '4.0.x' into 4.1.x

Closes gh-51599
This commit is contained in:
Andy Wilkinson
2026-09-07 08:26:42 +01:00
149 changed files with 5 additions and 243 deletions
@@ -46,7 +46,6 @@ class WebServerFactoryCustomizerBeanPostProcessorTests {
private final WebServerFactoryCustomizerBeanPostProcessor processor = new WebServerFactoryCustomizerBeanPostProcessor();
@Mock
@SuppressWarnings("NullAway.Init")
private ListableBeanFactory beanFactory;
@BeforeEach
@@ -44,7 +44,6 @@ import static org.mockito.Mockito.mock;
class WebServerPortFileWriterTests {
@TempDir
@SuppressWarnings("NullAway.Init")
File tempDir;
@BeforeEach
@@ -40,7 +40,6 @@ class DocumentRootTests {
private static final Log logger = LogFactory.getLog(DocumentRootTests.class);
@TempDir
@SuppressWarnings("NullAway.Init")
File tempDir;
private final DocumentRoot documentRoot = new DocumentRoot(logger);
@@ -47,7 +47,6 @@ import static org.assertj.core.api.Assertions.assertThatNoException;
class StaticResourceJarsTests {
@TempDir
@SuppressWarnings("NullAway.Init")
File tempDir;
@Test
@@ -60,7 +60,6 @@ class MockWebEnvironmentServletComponentScanIntegrationTests {
private @Nullable AnnotationConfigServletWebApplicationContext context;
@TempDir
@SuppressWarnings("NullAway.Init")
File temp;
@AfterEach
@@ -58,7 +58,6 @@ class ServletComponentScanIntegrationTests {
private @Nullable AnnotationConfigServletWebServerApplicationContext context;
@TempDir
@SuppressWarnings("NullAway.Init")
File temp;
@AfterEach
@@ -102,7 +102,6 @@ class ServletWebServerApplicationContextTests {
private final ServletWebServerApplicationContext context = new ServletWebServerApplicationContext();
@Captor
@SuppressWarnings("NullAway.Init")
private ArgumentCaptor<Filter> filterCaptor;
@AfterEach