Fix WebSocket web server customizer bean names

Closes gh-14582
pull/14582/merge
artsiom 6 years ago committed by Stephane Nicoll
parent 091d723166
commit 7fb13d0dc2

@ -52,7 +52,7 @@ public class WebSocketReactiveAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(name = "websocketReactiveWebServerCustomizer") @ConditionalOnMissingBean(name = "websocketReactiveWebServerCustomizer")
public TomcatWebSocketReactiveWebServerCustomizer websocketContainerCustomizer() { public TomcatWebSocketReactiveWebServerCustomizer websocketReactiveWebServerCustomizer() {
return new TomcatWebSocketReactiveWebServerCustomizer(); 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -63,7 +63,7 @@ public class WebSocketServletAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer") @ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer")
public TomcatWebSocketServletWebServerCustomizer websocketContainerCustomizer() { public TomcatWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() {
return new TomcatWebSocketServletWebServerCustomizer(); return new TomcatWebSocketServletWebServerCustomizer();
} }
@ -75,7 +75,7 @@ public class WebSocketServletAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer") @ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer")
public JettyWebSocketServletWebServerCustomizer websocketContainerCustomizer() { public JettyWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() {
return new JettyWebSocketServletWebServerCustomizer(); return new JettyWebSocketServletWebServerCustomizer();
} }
@ -87,7 +87,7 @@ public class WebSocketServletAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer") @ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer")
public UndertowWebSocketServletWebServerCustomizer websocketContainerCustomizer() { public UndertowWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() {
return new UndertowWebSocketServletWebServerCustomizer(); return new UndertowWebSocketServletWebServerCustomizer();
} }

Loading…
Cancel
Save