From 7fb13d0dc209d50b53c855d08a1280b13702cfe1 Mon Sep 17 00:00:00 2001 From: artsiom Date: Sat, 22 Sep 2018 19:28:06 +0300 Subject: [PATCH] Fix WebSocket web server customizer bean names Closes gh-14582 --- .../reactive/WebSocketReactiveAutoConfiguration.java | 2 +- .../servlet/WebSocketServletAutoConfiguration.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 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 9350a6cb85..24e00bda95 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 @@ -52,7 +52,7 @@ public class WebSocketReactiveAutoConfiguration { @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 cf66fe20a8..f201adaa8d 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 @@ -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(); }