From ab29a96a8d378b6095020d12c06f8a1fffd29854 Mon Sep 17 00:00:00 2001 From: Minsu Lee Date: Sat, 15 Jan 2022 13:25:30 +0900 Subject: [PATCH] Fix subprotocol for subscriptions-transport-ws See gh-256 --- .../graphql/web/webflux/GraphQlWebSocketHandler.java | 4 ++-- .../graphql/web/webmvc/GraphQlWebSocketHandler.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandler.java index c983e5a3..c0d279e6 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandler.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/web/webflux/GraphQlWebSocketHandler.java @@ -71,7 +71,7 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { private static final Log logger = LogFactory.getLog(GraphQlWebSocketHandler.class); private static final List SUB_PROTOCOL_LIST = - Arrays.asList("graphql-transport-ws", "subscriptions-transport-ws"); + Arrays.asList("graphql-transport-ws", "graphql-ws"); static final ResolvableType MAP_RESOLVABLE_TYPE = ResolvableType.forType(new ParameterizedTypeReference>() {}); @@ -127,7 +127,7 @@ public class GraphQlWebSocketHandler implements WebSocketHandler { @Override public Mono handle(WebSocketSession session) { HandshakeInfo handshakeInfo = session.getHandshakeInfo(); - if ("subscriptions-transport-ws".equalsIgnoreCase(handshakeInfo.getSubProtocol())) { + if ("graphql-ws".equalsIgnoreCase(handshakeInfo.getSubProtocol())) { if (logger.isDebugEnabled()) { logger.debug("apollographql/subscriptions-transport-ws is not supported, nor maintained. " + "Please, use https://github.com/enisdenjo/graphql-ws."); diff --git a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandler.java index caaafe19..609016e7 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandler.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/web/webmvc/GraphQlWebSocketHandler.java @@ -74,7 +74,7 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub private static final Log logger = LogFactory.getLog(GraphQlWebSocketHandler.class); private static final List SUB_PROTOCOL_LIST = - Arrays.asList("graphql-transport-ws", "subscriptions-transport-ws"); + Arrays.asList("graphql-transport-ws", "graphql-ws"); private final WebGraphQlHandler graphQlHandler; @@ -110,7 +110,7 @@ public class GraphQlWebSocketHandler extends TextWebSocketHandler implements Sub @Override public void afterConnectionEstablished(WebSocketSession session) { - if ("subscriptions-transport-ws".equalsIgnoreCase(session.getAcceptedProtocol())) { + if ("graphql-ws".equalsIgnoreCase(session.getAcceptedProtocol())) { if (logger.isDebugEnabled()) { logger.debug("apollographql/subscriptions-transport-ws is not supported, nor maintained. " + "Please, use https://github.com/enisdenjo/graphql-ws.");