Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid adding Jetty's upgrade filter to non-Jetty servers

Browse Source 
Fixes gh-38181
This commit is contained in:
Andy Wilkinson
2023-11-08 17:52:39 +00:00
parent 445d0a22db
commit b6a9c67719
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfigurationTests.java
View File

@@ -108,7 +108,7 @@ class WebSocketServletAutoConfigurationTests {
@Test
@Servlet5ClassPathOverrides
void jettyWebSocketUpgradeFilterIsAddedToServletContext() {
void jettyWebSocketUpgradeFilterIsAddedToServletContextOfJettyServer() {
try (AnnotationConfigServletWebServerApplicationContext context = new AnnotationConfigServletWebServerApplicationContext(
JettyConfiguration.class, WebSocketServletAutoConfiguration.JettyWebSocketConfiguration.class)) {
assertThat(context.getServletContext().getFilterRegistration(WebSocketUpgradeFilter.class.getName()))
@@ -116,6 +116,15 @@ class WebSocketServletAutoConfigurationTests {
}
}
@Test
void jettyWebSocketUpgradeFilterIsNotAddedToServletContextOfTomcatServer() {
try (AnnotationConfigServletWebServerApplicationContext context = new AnnotationConfigServletWebServerApplicationContext(
TomcatConfiguration.class, WebSocketServletAutoConfiguration.JettyWebSocketConfiguration.class)) {
assertThat(context.getServletContext().getFilterRegistration(WebSocketUpgradeFilter.class.getName()))
.isNull();
}
}
@Test
@SuppressWarnings("rawtypes")
void jettyWebSocketUpgradeFilterIsNotExposedAsABean() {