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;

0 commit comments

Comments
 (0)