Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit 3d0d97f

Browse files
committed
feat: refactor spring contexts to use new map of contexts instead
1 parent 3055fef commit 3d0d97f

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
package graphql.kickstart.spring;
22

33
import graphql.kickstart.execution.context.DefaultGraphQLContext;
4-
import java.util.Objects;
4+
import lombok.NonNull;
55
import org.dataloader.DataLoaderRegistry;
66
import org.springframework.web.server.ServerWebExchange;
77

88
public class GraphQLSpringServerWebExchangeContext extends DefaultGraphQLContext
99
implements GraphQLSpringContext {
1010

11-
private final ServerWebExchange serverWebExchange;
12-
1311
public GraphQLSpringServerWebExchangeContext(ServerWebExchange serverWebExchange) {
1412
this(new DataLoaderRegistry(), serverWebExchange);
1513
}
1614

1715
public GraphQLSpringServerWebExchangeContext(
18-
DataLoaderRegistry dataLoaderRegistry, ServerWebExchange serverWebExchange) {
19-
super(dataLoaderRegistry, null);
20-
this.serverWebExchange =
21-
Objects.requireNonNull(serverWebExchange, "Server web exchange cannot be null");
16+
DataLoaderRegistry dataLoaderRegistry, @NonNull ServerWebExchange serverWebExchange) {
17+
super(dataLoaderRegistry);
18+
put(ServerWebExchange.class, serverWebExchange);
2219
}
2320

21+
/**
22+
* @deprecated Use {@code
23+
* dataFetchingEnvironment.getGraphQlContext().get(ServerWebExchange.class)} instead. Since
24+
* 13.0.0
25+
*/
2426
@Override
27+
@Deprecated
2528
public ServerWebExchange getServerWebExchange() {
26-
return serverWebExchange;
29+
return (ServerWebExchange) getMapOfContext().get(ServerWebExchange.class);
2730
}
2831
}
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
package graphql.kickstart.spring.webflux;
22

33
import graphql.kickstart.execution.context.DefaultGraphQLContext;
4-
import java.util.Objects;
4+
import lombok.NonNull;
55
import org.dataloader.DataLoaderRegistry;
66
import org.springframework.web.reactive.socket.WebSocketSession;
77

88
public class DefaultGraphQLSpringWebSocketSessionContext extends DefaultGraphQLContext
99
implements GraphQLSpringWebSocketSessionContext {
1010

11-
private final WebSocketSession webSocketSession;
12-
1311
public DefaultGraphQLSpringWebSocketSessionContext(WebSocketSession webSocketSession) {
1412
this(new DataLoaderRegistry(), webSocketSession);
1513
}
1614

1715
public DefaultGraphQLSpringWebSocketSessionContext(
18-
DataLoaderRegistry dataLoaderRegistry, WebSocketSession webSocketSession) {
19-
super(dataLoaderRegistry, null);
20-
this.webSocketSession =
21-
Objects.requireNonNull(webSocketSession, "WebSocketSession is required");
16+
DataLoaderRegistry dataLoaderRegistry, @NonNull WebSocketSession webSocketSession) {
17+
super(dataLoaderRegistry);
18+
put(WebSocketSession.class, webSocketSession);
2219
}
2320

21+
/**
22+
* @deprecated Use {@code dataFetchingEnvironment.getGraphQlContext().get(WebSocketSession.class)}
23+
* instead. Since 13.0.0
24+
*/
2425
@Override
2526
public WebSocketSession getWebSocketSession() {
26-
return webSocketSession;
27+
return (WebSocketSession) getMapOfContext().get(WebSocketSession.class);
2728
}
2829
}

0 commit comments

Comments
 (0)