From fbf4724d781a30347b3830567417eef0dd803c3b Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 9 Jul 2021 20:16:58 +0100 Subject: [PATCH] Replace Jetty 9 only constant with explicit value Closes gh-27121 --- .../socket/server/jetty/Jetty10RequestUpgradeStrategy.java | 3 +-- .../web/socket/server/jetty/JettyRequestUpgradeStrategy.java | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java index 6c9dfb05068..1ba17565477 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/Jetty10RequestUpgradeStrategy.java @@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletResponse; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; -import org.eclipse.jetty.websocket.server.HandshakeRFC6455; import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.target.EmptyTargetSource; @@ -56,7 +55,7 @@ import org.springframework.web.socket.server.RequestUpgradeStrategy; */ public class Jetty10RequestUpgradeStrategy implements RequestUpgradeStrategy { - private static final String[] SUPPORTED_VERSIONS = new String[] { String.valueOf(HandshakeRFC6455.VERSION) }; + private static final String[] SUPPORTED_VERSIONS = new String[] { String.valueOf(13) }; private static final Class webSocketCreatorClass; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java index 32a2f4d3be7..b733141f39a 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2021 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. @@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig; -import org.eclipse.jetty.websocket.server.HandshakeRFC6455; import org.eclipse.jetty.websocket.server.WebSocketServerFactory; import org.springframework.context.Lifecycle; @@ -168,7 +167,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv @Override public String[] getSupportedVersions() { - return new String[] { String.valueOf(HandshakeRFC6455.VERSION) }; + return new String[] { String.valueOf(13) }; } @Override