Merge pull request #1845 from steve-community/1844-regression-websocket-connections-close-after-30-secs

make DefaultHandshakeHandler a bean (#1844)

Author: goekay

src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java

@@ -28,6 +28,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.jetty.websocket.core.WebSocketConstants;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
 import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
@@ -62,7 +63,7 @@ public class WebSocketConfiguration implements WebSocketConfigurer {
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
         OcppWebSocketHandshakeHandler handshakeHandler = new OcppWebSocketHandshakeHandler(
             chargeBoxIdValidator,
-            defaultHandshakeHandler(),
+            handshakeHandler(),
             Lists.newArrayList(ocpp16WebSocketEndpoint, ocpp15WebSocketEndpoint, ocpp12WebSocketEndpoint),
             chargePointRegistrationService
         );
@@ -77,7 +78,8 @@ public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
      *
      * Otherwise, defaults come from {@link WebSocketConstants}
      */
-    private static DefaultHandshakeHandler defaultHandshakeHandler() {
+    @Bean
+    public DefaultHandshakeHandler handshakeHandler() {
         JettyRequestUpgradeStrategy strategy = new JettyRequestUpgradeStrategy();
 
         strategy.addWebSocketConfigurer(configurable -> {