From 2be5a46dcda9250906cb0732d42576d2916a6539 Mon Sep 17 00:00:00 2001 From: artsiom Date: Sat, 22 Sep 2018 19:28:06 +0300 Subject: [PATCH] renaming the bean method for websocket --- .../reactive/WebSocketReactiveAutoConfiguration.java | 3 ++- .../servlet/WebSocketServletAutoConfiguration.java | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java index 9350a6cb854c..94181e5c4f2b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/reactive/WebSocketReactiveAutoConfiguration.java @@ -38,6 +38,7 @@ * installs the Tomcat WebSocket initializer. * * @author Brian Clozel + * @author Artsiom Yudovin * @since 2.0.0 */ @Configuration @@ -52,7 +53,7 @@ static class TomcatWebSocketConfiguration { @Bean @ConditionalOnMissingBean(name = "websocketReactiveWebServerCustomizer") - public TomcatWebSocketReactiveWebServerCustomizer websocketContainerCustomizer() { + public TomcatWebSocketReactiveWebServerCustomizer websocketReactiveWebServerCustomizer() { return new TomcatWebSocketReactiveWebServerCustomizer(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java index cf66fe20a8c2..261c24318eed 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketServletAutoConfiguration.java @@ -50,6 +50,7 @@ * @author Dave Syer * @author Phillip Webb * @author Andy Wilkinson + * @author Artsiom Yudovin */ @Configuration @ConditionalOnClass({ Servlet.class, ServerContainer.class }) @@ -63,7 +64,7 @@ static class TomcatWebSocketConfiguration { @Bean @ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer") - public TomcatWebSocketServletWebServerCustomizer websocketContainerCustomizer() { + public TomcatWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() { return new TomcatWebSocketServletWebServerCustomizer(); } @@ -75,7 +76,7 @@ static class JettyWebSocketConfiguration { @Bean @ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer") - public JettyWebSocketServletWebServerCustomizer websocketContainerCustomizer() { + public JettyWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() { return new JettyWebSocketServletWebServerCustomizer(); } @@ -87,7 +88,7 @@ static class UndertowWebSocketConfiguration { @Bean @ConditionalOnMissingBean(name = "websocketServletWebServerCustomizer") - public UndertowWebSocketServletWebServerCustomizer websocketContainerCustomizer() { + public UndertowWebSocketServletWebServerCustomizer websocketServletWebServerCustomizer() { return new UndertowWebSocketServletWebServerCustomizer(); }