Skip to content

Commit 38af304

Browse files
vojtapolvojtapol
committed
Nest 'servlet' package within 'graphql.kickstart'
1 parent 40ef866 commit 38af304

File tree

65 files changed

+148
-163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+148
-163
lines changed

‎examples/osgi/providers/src/main/java/graphql/servlet/examples/osgi/ExampleGraphQLProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet.examples.osgi;
1+
package graphql.kickstart.servlet.examples.osgi;
22

33
import graphql.schema.GraphQLFieldDefinition;
44
import graphql.schema.GraphQLType;

‎graphql-java-servlet/src/main/java/graphql/servlet/AbstractGraphQLHttpServlet.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AbstractGraphQLHttpServlet.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import static graphql.kickstart.execution.GraphQLRequest.createQueryOnlyRequest;
44

@@ -8,9 +8,9 @@
88
import graphql.kickstart.execution.GraphQLRequest;
99
import graphql.kickstart.execution.input.GraphQLSingleInvocationInput;
1010
import graphql.schema.GraphQLFieldDefinition;
11-
import graphql.servlet.core.GraphQLMBean;
12-
import graphql.servlet.core.GraphQLServletListener;
13-
import graphql.servlet.input.GraphQLInvocationInputFactory;
11+
import graphql.kickstart.servlet.core.GraphQLMBean;
12+
import graphql.kickstart.servlet.core.GraphQLServletListener;
13+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
1414
import java.util.ArrayList;
1515
import java.util.List;
1616
import java.util.Objects;

‎graphql-java-servlet/src/main/java/graphql/servlet/AbstractGraphQLInvocationInputParser.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AbstractGraphQLInvocationInputParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import graphql.kickstart.execution.context.ContextSetting;
44
import graphql.kickstart.execution.GraphQLObjectMapper;
5-
import graphql.servlet.input.GraphQLInvocationInputFactory;
5+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
66
import lombok.RequiredArgsConstructor;
77

88
@RequiredArgsConstructor

‎graphql-java-servlet/src/main/java/graphql/servlet/BatchedQueryResponseWriter.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/BatchedQueryResponseWriter.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
package graphql.servlet;
2-
3-
import static graphql.servlet.HttpRequestHandler.APPLICATION_JSON_UTF8;
4-
import static graphql.servlet.HttpRequestHandler.STATUS_OK;
1+
package graphql.kickstart.servlet;
52

63
import graphql.ExecutionResult;
74
import graphql.kickstart.execution.GraphQLObjectMapper;
@@ -20,8 +17,8 @@ class BatchedQueryResponseWriter implements QueryResponseWriter {
2017

2118
@Override
2219
public void write(HttpServletRequest request, HttpServletResponse response) throws IOException {
23-
response.setContentType(APPLICATION_JSON_UTF8);
24-
response.setStatus(STATUS_OK);
20+
response.setContentType(HttpRequestHandler.APPLICATION_JSON_UTF8);
21+
response.setStatus(HttpRequestHandler.STATUS_OK);
2522

2623
Iterator<ExecutionResult> executionInputIterator = results.iterator();
2724
StringBuilder responseBuilder = new StringBuilder();

‎graphql-java-servlet/src/main/java/graphql/servlet/ConfiguredGraphQLHttpServlet.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/ConfiguredGraphQLHttpServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import java.util.Objects;
44

‎graphql-java-servlet/src/main/java/graphql/servlet/DefaultGraphQLServlet.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/DefaultGraphQLServlet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import graphql.kickstart.execution.GraphQLObjectMapper;
44
import graphql.kickstart.execution.GraphQLQueryInvoker;
5-
import graphql.servlet.input.GraphQLInvocationInputFactory;
5+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
66

77
public class DefaultGraphQLServlet extends AbstractGraphQLHttpServlet {
88

‎graphql-java-servlet/src/main/java/graphql/servlet/ErrorQueryResponseWriter.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/ErrorQueryResponseWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import java.io.IOException;
44
import javax.servlet.http.HttpServletRequest;

‎graphql-java-servlet/src/main/java/graphql/servlet/ExecutionResultSubscriber.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/ExecutionResultSubscriber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import graphql.ExecutionResult;
44
import graphql.kickstart.execution.GraphQLObjectMapper;

‎graphql-java-servlet/src/main/java/graphql/servlet/GraphQLConfiguration.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLConfiguration.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import graphql.kickstart.execution.GraphQLInvoker;
44
import graphql.kickstart.execution.GraphQLObjectMapper;
55
import graphql.kickstart.execution.GraphQLQueryInvoker;
66
import graphql.kickstart.execution.context.ContextSetting;
7+
import graphql.kickstart.servlet.config.DefaultGraphQLSchemaServletProvider;
8+
import graphql.kickstart.servlet.config.GraphQLSchemaServletProvider;
9+
import graphql.kickstart.servlet.context.GraphQLServletContextBuilder;
10+
import graphql.kickstart.servlet.input.BatchInputPreProcessor;
11+
import graphql.kickstart.servlet.input.NoOpBatchInputPreProcessor;
712
import graphql.schema.GraphQLSchema;
8-
import graphql.servlet.config.DefaultGraphQLSchemaServletProvider;
9-
import graphql.servlet.config.GraphQLSchemaServletProvider;
10-
import graphql.servlet.context.GraphQLServletContextBuilder;
11-
import graphql.servlet.core.GraphQLServletListener;
12-
import graphql.servlet.core.GraphQLServletRootObjectBuilder;
13-
import graphql.servlet.core.internal.GraphQLThreadFactory;
14-
import graphql.servlet.input.BatchInputPreProcessor;
15-
import graphql.servlet.input.GraphQLInvocationInputFactory;
16-
import graphql.servlet.input.NoOpBatchInputPreProcessor;
13+
import graphql.kickstart.servlet.core.GraphQLServletListener;
14+
import graphql.kickstart.servlet.core.GraphQLServletRootObjectBuilder;
15+
import graphql.kickstart.servlet.core.internal.GraphQLThreadFactory;
16+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
17+
1718
import java.util.ArrayList;
1819
import java.util.List;
1920
import java.util.concurrent.Executor;

‎graphql-java-servlet/src/main/java/graphql/servlet/GraphQLGetInvocationInputParser.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLGetInvocationInputParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import graphql.GraphQLException;
44
import graphql.kickstart.execution.context.ContextSetting;
55
import graphql.kickstart.execution.GraphQLObjectMapper;
66
import graphql.kickstart.execution.GraphQLRequest;
77
import graphql.kickstart.execution.input.GraphQLInvocationInput;
8-
import graphql.servlet.input.GraphQLInvocationInputFactory;
8+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
99
import java.io.IOException;
1010
import java.util.HashMap;
1111
import java.util.List;

‎graphql-java-servlet/src/main/java/graphql/servlet/GraphQLHttpServlet.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLHttpServlet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import graphql.schema.GraphQLSchema;
44
import graphql.kickstart.execution.GraphQLObjectMapper;
55
import graphql.kickstart.execution.GraphQLQueryInvoker;
6-
import graphql.servlet.input.GraphQLInvocationInputFactory;
6+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
77

88
/**
99
* @author Michiel Oliemans

‎graphql-java-servlet/src/main/java/graphql/servlet/GraphQLInvocationInputParser.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLInvocationInputParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import graphql.kickstart.execution.context.ContextSetting;
44
import graphql.kickstart.execution.GraphQLObjectMapper;
55
import graphql.kickstart.execution.input.GraphQLInvocationInput;
6-
import graphql.servlet.input.GraphQLInvocationInputFactory;
6+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
77
import java.io.IOException;
88
import javax.servlet.ServletException;
99
import javax.servlet.http.HttpServletRequest;

‎graphql-java-servlet/src/main/java/graphql/servlet/GraphQLMultipartInvocationInputParser.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLMultipartInvocationInputParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import static java.util.stream.Collectors.joining;
44

55
import graphql.GraphQLException;
66
import graphql.kickstart.execution.context.ContextSetting;
77
import graphql.kickstart.execution.GraphQLObjectMapper;
88
import graphql.kickstart.execution.GraphQLRequest;
9-
import graphql.servlet.core.internal.VariableMapper;
9+
import graphql.kickstart.servlet.core.internal.VariableMapper;
1010
import graphql.kickstart.execution.input.GraphQLInvocationInput;
11-
import graphql.servlet.input.GraphQLInvocationInputFactory;
11+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
1212
import java.io.BufferedReader;
1313
import java.io.IOException;
1414
import java.io.InputStream;

‎graphql-java-servlet/src/main/java/graphql/servlet/GraphQLPostInvocationInputParser.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLPostInvocationInputParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import static java.util.stream.Collectors.joining;
44

@@ -7,7 +7,7 @@
77
import graphql.kickstart.execution.context.ContextSetting;
88
import graphql.kickstart.execution.input.GraphQLInvocationInput;
99
import graphql.kickstart.execution.GraphQLObjectMapper;
10-
import graphql.servlet.input.GraphQLInvocationInputFactory;
10+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
1111
import java.io.IOException;
1212
import java.util.List;
1313
import javax.servlet.http.HttpServletRequest;

‎graphql-java-servlet/src/main/java/graphql/servlet/GraphQLWebsocketServlet.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLWebsocketServlet.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import static java.util.Collections.singletonList;
44
import static java.util.stream.Collectors.toList;
@@ -12,10 +12,11 @@
1212
import graphql.kickstart.execution.subscriptions.SubscriptionProtocolFactory;
1313
import graphql.kickstart.execution.subscriptions.SubscriptionSession;
1414
import graphql.kickstart.execution.subscriptions.apollo.ApolloSubscriptionConnectionListener;
15-
import graphql.servlet.apollo.ApolloWebSocketSubscriptionProtocolFactory;
16-
import graphql.servlet.subscriptions.FallbackSubscriptionProtocolFactory;
17-
import graphql.servlet.subscriptions.WebSocketSendSubscriber;
18-
import graphql.servlet.subscriptions.WebSocketSubscriptionProtocolFactory;
15+
import graphql.kickstart.servlet.apollo.ApolloWebSocketSubscriptionProtocolFactory;
16+
import graphql.kickstart.servlet.subscriptions.FallbackSubscriptionProtocolFactory;
17+
import graphql.kickstart.servlet.subscriptions.WebSocketSendSubscriber;
18+
import graphql.kickstart.servlet.subscriptions.WebSocketSubscriptionProtocolFactory;
19+
1920
import java.io.EOFException;
2021
import java.io.IOException;
2122
import java.util.ArrayList;

‎graphql-java-servlet/src/main/java/graphql/servlet/HttpRequestHandler.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/HttpRequestHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import javax.servlet.http.HttpServletRequest;
44
import javax.servlet.http.HttpServletResponse;

‎graphql-java-servlet/src/main/java/graphql/servlet/HttpRequestHandlerImpl.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/HttpRequestHandlerImpl.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package graphql.servlet;
2-
3-
import static graphql.servlet.QueryResponseWriter.createWriter;
1+
package graphql.kickstart.servlet;
42

53
import graphql.GraphQLException;
64
import graphql.kickstart.execution.GraphQLInvoker;
75
import graphql.kickstart.execution.GraphQLQueryResult;
8-
import graphql.servlet.input.BatchInputPreProcessResult;
9-
import graphql.servlet.input.BatchInputPreProcessor;
6+
import graphql.kickstart.servlet.input.BatchInputPreProcessResult;
7+
import graphql.kickstart.servlet.input.BatchInputPreProcessor;
108
import graphql.kickstart.execution.input.GraphQLBatchedInvocationInput;
119
import graphql.kickstart.execution.input.GraphQLInvocationInput;
1210
import graphql.kickstart.execution.input.GraphQLSingleInvocationInput;
@@ -53,7 +51,7 @@ private void execute(GraphQLInvocationInput invocationInput, HttpServletRequest
5351
try {
5452
GraphQLQueryResult queryResult = invoke(invocationInput, request, response);
5553

56-
QueryResponseWriter queryResponseWriter = createWriter(queryResult, configuration.getObjectMapper(),
54+
QueryResponseWriter queryResponseWriter = QueryResponseWriter.createWriter(queryResult, configuration.getObjectMapper(),
5755
configuration.getSubscriptionTimeout());
5856
queryResponseWriter.write(request, response);
5957
} catch (Throwable t) {

‎graphql-java-servlet/src/main/java/graphql/servlet/OsgiGraphQLHttpServlet.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/OsgiGraphQLHttpServlet.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import static graphql.schema.GraphQLObjectType.newObject;
44
import static graphql.schema.GraphQLSchema.newSchema;
@@ -12,31 +12,31 @@
1212
import aQute.bnd.component.annotations.ReferencePolicyOption;
1313
import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
1414
import graphql.execution.preparsed.PreparsedDocumentProvider;
15+
import graphql.kickstart.servlet.config.DefaultGraphQLSchemaServletProvider;
1516
import graphql.schema.GraphQLCodeRegistry;
1617
import graphql.schema.GraphQLObjectType;
1718
import graphql.schema.GraphQLType;
1819
import graphql.kickstart.execution.config.DefaultExecutionStrategyProvider;
19-
import graphql.servlet.config.DefaultGraphQLSchemaServletProvider;
2020
import graphql.kickstart.execution.config.ExecutionStrategyProvider;
21-
import graphql.servlet.config.GraphQLSchemaServletProvider;
22-
import graphql.servlet.core.GraphQLServletRootObjectBuilder;
23-
import graphql.servlet.osgi.GraphQLCodeRegistryProvider;
24-
import graphql.servlet.osgi.GraphQLMutationProvider;
25-
import graphql.servlet.osgi.GraphQLProvider;
26-
import graphql.servlet.osgi.GraphQLQueryProvider;
27-
import graphql.servlet.osgi.GraphQLSubscriptionProvider;
28-
import graphql.servlet.osgi.GraphQLTypesProvider;
21+
import graphql.kickstart.servlet.config.GraphQLSchemaServletProvider;
22+
import graphql.kickstart.servlet.core.GraphQLServletRootObjectBuilder;
23+
import graphql.kickstart.servlet.osgi.GraphQLCodeRegistryProvider;
24+
import graphql.kickstart.servlet.osgi.GraphQLMutationProvider;
25+
import graphql.kickstart.servlet.osgi.GraphQLProvider;
26+
import graphql.kickstart.servlet.osgi.GraphQLQueryProvider;
27+
import graphql.kickstart.servlet.osgi.GraphQLSubscriptionProvider;
28+
import graphql.kickstart.servlet.osgi.GraphQLTypesProvider;
2929
import graphql.kickstart.execution.config.InstrumentationProvider;
30-
import graphql.servlet.context.DefaultGraphQLServletContextBuilder;
31-
import graphql.servlet.context.GraphQLServletContextBuilder;
30+
import graphql.kickstart.servlet.context.DefaultGraphQLServletContextBuilder;
31+
import graphql.kickstart.servlet.context.GraphQLServletContextBuilder;
3232
import graphql.kickstart.execution.error.DefaultGraphQLErrorHandler;
33-
import graphql.servlet.core.DefaultGraphQLRootObjectBuilder;
33+
import graphql.kickstart.servlet.core.DefaultGraphQLRootObjectBuilder;
3434
import graphql.kickstart.execution.error.GraphQLErrorHandler;
3535
import graphql.kickstart.execution.GraphQLObjectMapper;
3636
import graphql.kickstart.execution.GraphQLQueryInvoker;
3737
import graphql.kickstart.execution.GraphQLRootObjectBuilder;
38-
import graphql.servlet.core.GraphQLServletListener;
39-
import graphql.servlet.input.GraphQLInvocationInputFactory;
38+
import graphql.kickstart.servlet.core.GraphQLServletListener;
39+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
4040
import graphql.kickstart.execution.instrumentation.NoOpInstrumentationProvider;
4141
import java.util.ArrayList;
4242
import java.util.HashSet;

‎graphql-java-servlet/src/main/java/graphql/servlet/QueryResponseWriter.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/QueryResponseWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import graphql.kickstart.execution.GraphQLQueryResult;
44
import graphql.kickstart.execution.GraphQLObjectMapper;

‎graphql-java-servlet/src/main/java/graphql/servlet/SimpleGraphQLHttpServlet.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/SimpleGraphQLHttpServlet.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import graphql.kickstart.execution.GraphQLObjectMapper;
44
import graphql.kickstart.execution.GraphQLQueryInvoker;
5+
import graphql.kickstart.servlet.config.GraphQLSchemaServletProvider;
56
import graphql.schema.GraphQLSchema;
6-
import graphql.servlet.config.GraphQLSchemaServletProvider;
7-
import graphql.servlet.core.GraphQLServletListener;
8-
import graphql.servlet.input.GraphQLInvocationInputFactory;
7+
import graphql.kickstart.servlet.core.GraphQLServletListener;
8+
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
99
import java.util.ArrayList;
1010
import java.util.List;
1111
import java.util.Objects;

‎graphql-java-servlet/src/main/java/graphql/servlet/SingleAsynchronousQueryResponseWriter.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/SingleAsynchronousQueryResponseWriter.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
package graphql.servlet;
2-
3-
import static graphql.servlet.HttpRequestHandler.APPLICATION_EVENT_STREAM_UTF8;
4-
import static graphql.servlet.HttpRequestHandler.STATUS_OK;
1+
package graphql.kickstart.servlet;
52

63
import graphql.ExecutionResult;
74
import graphql.GraphQL;
@@ -29,8 +26,8 @@ class SingleAsynchronousQueryResponseWriter implements QueryResponseWriter {
2926
@Override
3027
public void write(HttpServletRequest request, HttpServletResponse response) {
3128
Objects.requireNonNull(request, "Http servlet request cannot be null");
32-
response.setContentType(APPLICATION_EVENT_STREAM_UTF8);
33-
response.setStatus(STATUS_OK);
29+
response.setContentType(HttpRequestHandler.APPLICATION_EVENT_STREAM_UTF8);
30+
response.setStatus(HttpRequestHandler.STATUS_OK);
3431

3532
boolean isInAsyncThread = request.isAsyncStarted();
3633
AsyncContext asyncContext = isInAsyncThread ? request.getAsyncContext() : request.startAsync(request, response);

‎graphql-java-servlet/src/main/java/graphql/servlet/SingleQueryResponseWriter.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/SingleQueryResponseWriter.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
package graphql.servlet;
2-
3-
import static graphql.servlet.HttpRequestHandler.APPLICATION_JSON_UTF8;
4-
import static graphql.servlet.HttpRequestHandler.STATUS_OK;
1+
package graphql.kickstart.servlet;
52

63
import graphql.ExecutionResult;
74
import graphql.kickstart.execution.GraphQLObjectMapper;
85
import java.io.IOException;
9-
import java.nio.charset.Charset;
106
import java.nio.charset.StandardCharsets;
117
import javax.servlet.http.HttpServletRequest;
128
import javax.servlet.http.HttpServletResponse;
@@ -20,8 +16,8 @@ class SingleQueryResponseWriter implements QueryResponseWriter {
2016

2117
@Override
2218
public void write(HttpServletRequest request, HttpServletResponse response) throws IOException {
23-
response.setContentType(APPLICATION_JSON_UTF8);
24-
response.setStatus(STATUS_OK);
19+
response.setContentType(HttpRequestHandler.APPLICATION_JSON_UTF8);
20+
response.setStatus(HttpRequestHandler.STATUS_OK);
2521
String responseContent = graphQLObjectMapper.serializeResultAsJson(result);
2622
response.setContentLength(responseContent.getBytes(StandardCharsets.UTF_8).length);
2723
response.getWriter().write(responseContent);

‎graphql-java-servlet/src/main/java/graphql/servlet/StaticDataPublisher.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/StaticDataPublisher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import graphql.execution.reactive.SingleSubscriberPublisher;
44
import org.reactivestreams.Publisher;

‎graphql-java-servlet/src/main/java/graphql/servlet/SubscriptionAsyncListener.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/SubscriptionAsyncListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet;
1+
package graphql.kickstart.servlet;
22

33
import java.util.concurrent.atomic.AtomicReference;
44
import javax.servlet.AsyncEvent;

‎graphql-java-servlet/src/main/java/graphql/servlet/apollo/ApolloScalars.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/apollo/ApolloScalars.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet.apollo;
1+
package graphql.kickstart.servlet.apollo;
22

33
import graphql.schema.Coercing;
44
import graphql.schema.CoercingParseLiteralException;

‎graphql-java-servlet/src/main/java/graphql/servlet/apollo/ApolloWebSocketSubscriptionProtocolFactory.java renamed to ‎graphql-java-servlet/src/main/java/graphql/kickstart/servlet/apollo/ApolloWebSocketSubscriptionProtocolFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package graphql.servlet.apollo;
1+
package graphql.kickstart.servlet.apollo;
22

33
import graphql.kickstart.execution.GraphQLInvoker;
44
import graphql.kickstart.execution.GraphQLObjectMapper;
@@ -7,7 +7,7 @@
77
import graphql.kickstart.execution.subscriptions.SubscriptionSession;
88
import graphql.kickstart.execution.subscriptions.apollo.ApolloSubscriptionConnectionListener;
99
import graphql.kickstart.execution.subscriptions.apollo.ApolloSubscriptionProtocolFactory;
10-
import graphql.servlet.subscriptions.WebSocketSubscriptionProtocolFactory;
10+
import graphql.kickstart.servlet.subscriptions.WebSocketSubscriptionProtocolFactory;
1111
import java.time.Duration;
1212
import java.util.Collection;
1313
import javax.websocket.Session;

0 commit comments

Comments
 (0)