mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge pull request #14582 from ayudovin
* pr/14582: Fix WebSocket web server customizer bean names
This commit is contained in:
commit
ed615d4267
@ -52,7 +52,7 @@ public class WebSocketReactiveAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(name = "websocketReactiveWebServerCustomizer")
|
||||
public TomcatWebSocketReactiveWebServerCustomizer websocketContainerCustomizer() {
|
||||
public TomcatWebSocketReactiveWebServerCustomizer websocketReactiveWebServerCustomizer() {
|
||||
return new TomcatWebSocketReactiveWebServerCustomizer();
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
* Copyright 2012-2018 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -63,7 +63,7 @@ public class WebSocketServletAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer")
|
||||
public TomcatWebSocketServletWebServerCustomizer websocketContainerCustomizer() {
|
||||
public TomcatWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() {
|
||||
return new TomcatWebSocketServletWebServerCustomizer();
|
||||
}
|
||||
|
||||
@ -75,7 +75,7 @@ public class WebSocketServletAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer")
|
||||
public JettyWebSocketServletWebServerCustomizer websocketContainerCustomizer() {
|
||||
public JettyWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() {
|
||||
return new JettyWebSocketServletWebServerCustomizer();
|
||||
}
|
||||
|
||||
@ -87,7 +87,7 @@ public class WebSocketServletAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer")
|
||||
public UndertowWebSocketServletWebServerCustomizer websocketContainerCustomizer() {
|
||||
public UndertowWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() {
|
||||
return new UndertowWebSocketServletWebServerCustomizer();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user