Merge branch '4.0.x'

Closes gh-50275
This commit is contained in:
Andy Wilkinson
2026-05-01 11:45:42 +01:00
2 changed files with 49 additions and 1 deletions
@@ -18,7 +18,9 @@ package org.springframework.boot.devtools.restart.server;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InvalidClassException;
import java.io.ObjectOutputStream;
import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -29,6 +31,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile;
import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles;
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.http.server.ServletServerHttpResponse;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -107,6 +111,20 @@ class HttpRestartServerTests {
assertThat(response.getStatus()).isEqualTo(500);
}
@Test
@ExtendWith(OutputCaptureExtension.class)
void sendBadSerializedData(CapturedOutput output) throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
MockHttpServletResponse response = new MockHttpServletResponse();
byte[] bytes = serialize(List.of("not", "allowed"));
request.setContent(bytes);
this.server.handle(new ServletServerHttpRequest(request), new ServletServerHttpResponse(response));
then(this.delegate).shouldHaveNoInteractions();
assertThat(response.getStatus()).isEqualTo(500);
assertThat(output).contains(InvalidClassException.class.getName())
.doesNotContain(ClassCastException.class.getName());
}
private byte[] serialize(Object object) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);