Skip to content

Commit c5f7792

Browse files
committed
made deafult contexts public classes, simplified stream logic in request stack
1 parent b855d63 commit c5f7792

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/main/java/graphql/servlet/context/DefaultGraphQLServletContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.Map;
1111
import java.util.stream.Collectors;
1212

13-
class DefaultGraphQLServletContext extends DefaultGraphQLContext implements GraphQLServletContext {
13+
public class DefaultGraphQLServletContext extends DefaultGraphQLContext implements GraphQLServletContext {
1414

1515
private final HttpServletRequest httpServletRequest;
1616
private final HttpServletResponse httpServletResponse;

src/main/java/graphql/servlet/context/DefaultGraphQLWebSocketContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import javax.websocket.server.HandshakeRequest;
99
import java.util.Optional;
1010

11-
class DefaultGraphQLWebSocketContext extends DefaultGraphQLContext implements GraphQLWebSocketContext {
11+
public class DefaultGraphQLWebSocketContext extends DefaultGraphQLContext implements GraphQLWebSocketContext {
1212

1313
private final Session session;
1414
private final HandshakeRequest handshakeRequest;

src/main/java/graphql/servlet/instrumentation/RequestStack.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,8 @@ public void setStatus(ExecutionId executionId, boolean toState) {
124124
* @return if all managed executions are ready to be dispatched.
125125
*/
126126
public boolean allReady() {
127-
List<Integer> dispatchStack = activeRequests.values().stream().findFirst().map(CallStack::getDispatchedLevels).orElse(Collections.emptyList());
128127
return status.values().stream().noneMatch(Boolean.FALSE::equals) &&
129-
activeRequests.values().stream().map(CallStack::getDispatchedLevels).allMatch(dispatchStack::equals);
128+
activeRequests.values().stream().map(CallStack::getDispatchedLevels).distinct().count() <= 1;
130129
}
131130

132131
/**

0 commit comments

Comments
 (0)