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

Avoid using reflection when configuring Tomcat listener

Browse Source 
This benefits native image building and AOT compilation,
as reflection requires manual configuration.

See gh-22329
This commit is contained in:
Filip Hanik
2020-07-14 08:21:03 -07:00
committed by Andy Wilkinson
parent 177b3918ee
commit be7048b58f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/TomcatWebSocketReactiveWebServerCustomizer.java
View File

@@ -16,8 +16,9 @@
package org.springframework.boot.autoconfigure.websocket.reactive; package org.springframework.boot.autoconfigure.websocket.reactive;
import org.apache.tomcat.websocket.server.WsContextListener; import java.util.Collections;
import org.apache.tomcat.websocket.server.WsSci;
import org.springframework.boot.web.embedded.tomcat.TomcatReactiveWebServerFactory; import org.springframework.boot.web.embedded.tomcat.TomcatReactiveWebServerFactory;
import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
@@ -33,7 +34,8 @@ public class TomcatWebSocketReactiveWebServerCustomizer
@Override @Override
public void customize(TomcatReactiveWebServerFactory factory) { public void customize(TomcatReactiveWebServerFactory factory) {
factory.addContextCustomizers((context) -> context.addApplicationListener(WsContextListener.class.getName())); factory.addContextCustomizers((context) ->
context.addServletContainerInitializer(new WsSci(), Collections.emptySet()));
} }
@Override @Override

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/TomcatWebSocketServletWebServerCustomizer.java
View File

@@ -16,8 +16,9 @@
package org.springframework.boot.autoconfigure.websocket.servlet; package org.springframework.boot.autoconfigure.websocket.servlet;
import org.apache.tomcat.websocket.server.WsContextListener; import java.util.Collections;
import org.apache.tomcat.websocket.server.WsSci;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
@@ -35,7 +36,8 @@ public class TomcatWebSocketServletWebServerCustomizer
@Override @Override
public void customize(TomcatServletWebServerFactory factory) { public void customize(TomcatServletWebServerFactory factory) {
factory.addContextCustomizers((context) -> context.addApplicationListener(WsContextListener.class.getName())); factory.addContextCustomizers((context) ->
context.addServletContainerInitializer(new WsSci(), Collections.emptySet()));
} }
@Override @Override