Skip to content

Commit

Permalink
Nest 'servlet' package within 'graphql.kickstart'
Browse files Browse the repository at this point in the history
  • Loading branch information
@vojtapol
vojtapol committed Feb 3, 2020
1 parent 40ef866 commit 38af304
Show file tree
Hide file tree
Showing 65 changed files with 148 additions and 163 deletions.
2 changes: 1 addition & 1 deletion ...es/osgi/providers/src/main/java/graphql/servlet/examples/osgi/ExampleGraphQLProvider.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet.examples.osgi;
package graphql.kickstart.servlet.examples.osgi;

import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLType;
Expand Down
8 changes: 4 additions & 4 deletions ...l/servlet/AbstractGraphQLHttpServlet.java → ...t/servlet/AbstractGraphQLHttpServlet.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet;
package graphql.kickstart.servlet;

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

Expand All @@ -8,9 +8,9 @@
import graphql.kickstart.execution.GraphQLRequest;
import graphql.kickstart.execution.input.GraphQLSingleInvocationInput;
import graphql.schema.GraphQLFieldDefinition;
import graphql.servlet.core.GraphQLMBean;
import graphql.servlet.core.GraphQLServletListener;
import graphql.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.servlet.core.GraphQLMBean;
import graphql.kickstart.servlet.core.GraphQLServletListener;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
Expand Down
4 changes: 2 additions & 2 deletions ...AbstractGraphQLInvocationInputParser.java → ...AbstractGraphQLInvocationInputParser.java
View file
@@ -1,8 +1,8 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import graphql.kickstart.execution.context.ContextSetting;
import graphql.kickstart.execution.GraphQLObjectMapper;
import graphql.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor
Expand Down
9 changes: 3 additions & 6 deletions ...l/servlet/BatchedQueryResponseWriter.java → ...t/servlet/BatchedQueryResponseWriter.java
View file
@@ -1,7 +1,4 @@
package graphql.servlet;

import static graphql.servlet.HttpRequestHandler.APPLICATION_JSON_UTF8;
import static graphql.servlet.HttpRequestHandler.STATUS_OK;
package graphql.kickstart.servlet;

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

@Override
public void write(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.setContentType(APPLICATION_JSON_UTF8);
response.setStatus(STATUS_OK);
response.setContentType(HttpRequestHandler.APPLICATION_JSON_UTF8);
response.setStatus(HttpRequestHandler.STATUS_OK);

Iterator<ExecutionResult> executionInputIterator = results.iterator();
StringBuilder responseBuilder = new StringBuilder();
Expand Down
2 changes: 1 addition & 1 deletion ...servlet/ConfiguredGraphQLHttpServlet.java → ...servlet/ConfiguredGraphQLHttpServlet.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import java.util.Objects;

Expand Down
4 changes: 2 additions & 2 deletions ...raphql/servlet/DefaultGraphQLServlet.java → ...kstart/servlet/DefaultGraphQLServlet.java
View file
@@ -1,8 +1,8 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import graphql.kickstart.execution.GraphQLObjectMapper;
import graphql.kickstart.execution.GraphQLQueryInvoker;
import graphql.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;

public class DefaultGraphQLServlet extends AbstractGraphQLHttpServlet {

Expand Down
2 changes: 1 addition & 1 deletion ...hql/servlet/ErrorQueryResponseWriter.java → ...art/servlet/ErrorQueryResponseWriter.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
Expand Down
2 changes: 1 addition & 1 deletion ...ql/servlet/ExecutionResultSubscriber.java → ...rt/servlet/ExecutionResultSubscriber.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import graphql.ExecutionResult;
import graphql.kickstart.execution.GraphQLObjectMapper;
Expand Down
21 changes: 11 additions & 10 deletions ...graphql/servlet/GraphQLConfiguration.java → ...ckstart/servlet/GraphQLConfiguration.java
View file
@@ -1,19 +1,20 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import graphql.kickstart.execution.GraphQLInvoker;
import graphql.kickstart.execution.GraphQLObjectMapper;
import graphql.kickstart.execution.GraphQLQueryInvoker;
import graphql.kickstart.execution.context.ContextSetting;
import graphql.kickstart.servlet.config.DefaultGraphQLSchemaServletProvider;
import graphql.kickstart.servlet.config.GraphQLSchemaServletProvider;
import graphql.kickstart.servlet.context.GraphQLServletContextBuilder;
import graphql.kickstart.servlet.input.BatchInputPreProcessor;
import graphql.kickstart.servlet.input.NoOpBatchInputPreProcessor;
import graphql.schema.GraphQLSchema;
import graphql.servlet.config.DefaultGraphQLSchemaServletProvider;
import graphql.servlet.config.GraphQLSchemaServletProvider;
import graphql.servlet.context.GraphQLServletContextBuilder;
import graphql.servlet.core.GraphQLServletListener;
import graphql.servlet.core.GraphQLServletRootObjectBuilder;
import graphql.servlet.core.internal.GraphQLThreadFactory;
import graphql.servlet.input.BatchInputPreProcessor;
import graphql.servlet.input.GraphQLInvocationInputFactory;
import graphql.servlet.input.NoOpBatchInputPreProcessor;
import graphql.kickstart.servlet.core.GraphQLServletListener;
import graphql.kickstart.servlet.core.GraphQLServletRootObjectBuilder;
import graphql.kickstart.servlet.core.internal.GraphQLThreadFactory;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Executor;
Expand Down
4 changes: 2 additions & 2 deletions ...vlet/GraphQLGetInvocationInputParser.java → ...vlet/GraphQLGetInvocationInputParser.java
View file
@@ -1,11 +1,11 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import graphql.GraphQLException;
import graphql.kickstart.execution.context.ContextSetting;
import graphql.kickstart.execution.GraphQLObjectMapper;
import graphql.kickstart.execution.GraphQLRequest;
import graphql.kickstart.execution.input.GraphQLInvocationInput;
import graphql.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions ...a/graphql/servlet/GraphQLHttpServlet.java → ...kickstart/servlet/GraphQLHttpServlet.java
View file
@@ -1,9 +1,9 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import graphql.schema.GraphQLSchema;
import graphql.kickstart.execution.GraphQLObjectMapper;
import graphql.kickstart.execution.GraphQLQueryInvoker;
import graphql.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;

/**
* @author Michiel Oliemans
Expand Down
4 changes: 2 additions & 2 deletions ...servlet/GraphQLInvocationInputParser.java → ...servlet/GraphQLInvocationInputParser.java
View file
@@ -1,9 +1,9 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import graphql.kickstart.execution.context.ContextSetting;
import graphql.kickstart.execution.GraphQLObjectMapper;
import graphql.kickstart.execution.input.GraphQLInvocationInput;
import graphql.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
Expand Down
6 changes: 3 additions & 3 deletions ...raphQLMultipartInvocationInputParser.java → ...raphQLMultipartInvocationInputParser.java
View file
@@ -1,14 +1,14 @@
package graphql.servlet;
package graphql.kickstart.servlet;

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

import graphql.GraphQLException;
import graphql.kickstart.execution.context.ContextSetting;
import graphql.kickstart.execution.GraphQLObjectMapper;
import graphql.kickstart.execution.GraphQLRequest;
import graphql.servlet.core.internal.VariableMapper;
import graphql.kickstart.servlet.core.internal.VariableMapper;
import graphql.kickstart.execution.input.GraphQLInvocationInput;
import graphql.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
Expand Down
4 changes: 2 additions & 2 deletions ...let/GraphQLPostInvocationInputParser.java → ...let/GraphQLPostInvocationInputParser.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet;
package graphql.kickstart.servlet;

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

Expand All @@ -7,7 +7,7 @@
import graphql.kickstart.execution.context.ContextSetting;
import graphql.kickstart.execution.input.GraphQLInvocationInput;
import graphql.kickstart.execution.GraphQLObjectMapper;
import graphql.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
import java.io.IOException;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
Expand Down
11 changes: 6 additions & 5 deletions ...phql/servlet/GraphQLWebsocketServlet.java → ...tart/servlet/GraphQLWebsocketServlet.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import static java.util.Collections.singletonList;
import static java.util.stream.Collectors.toList;
Expand All @@ -12,10 +12,11 @@
import graphql.kickstart.execution.subscriptions.SubscriptionProtocolFactory;
import graphql.kickstart.execution.subscriptions.SubscriptionSession;
import graphql.kickstart.execution.subscriptions.apollo.ApolloSubscriptionConnectionListener;
import graphql.servlet.apollo.ApolloWebSocketSubscriptionProtocolFactory;
import graphql.servlet.subscriptions.FallbackSubscriptionProtocolFactory;
import graphql.servlet.subscriptions.WebSocketSendSubscriber;
import graphql.servlet.subscriptions.WebSocketSubscriptionProtocolFactory;
import graphql.kickstart.servlet.apollo.ApolloWebSocketSubscriptionProtocolFactory;
import graphql.kickstart.servlet.subscriptions.FallbackSubscriptionProtocolFactory;
import graphql.kickstart.servlet.subscriptions.WebSocketSendSubscriber;
import graphql.kickstart.servlet.subscriptions.WebSocketSubscriptionProtocolFactory;

import java.io.EOFException;
import java.io.IOException;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...a/graphql/servlet/HttpRequestHandler.java → ...kickstart/servlet/HttpRequestHandler.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Expand Down
10 changes: 4 additions & 6 deletions ...aphql/servlet/HttpRequestHandlerImpl.java → ...start/servlet/HttpRequestHandlerImpl.java
View file
@@ -1,12 +1,10 @@
package graphql.servlet;

import static graphql.servlet.QueryResponseWriter.createWriter;
package graphql.kickstart.servlet;

import graphql.GraphQLException;
import graphql.kickstart.execution.GraphQLInvoker;
import graphql.kickstart.execution.GraphQLQueryResult;
import graphql.servlet.input.BatchInputPreProcessResult;
import graphql.servlet.input.BatchInputPreProcessor;
import graphql.kickstart.servlet.input.BatchInputPreProcessResult;
import graphql.kickstart.servlet.input.BatchInputPreProcessor;
import graphql.kickstart.execution.input.GraphQLBatchedInvocationInput;
import graphql.kickstart.execution.input.GraphQLInvocationInput;
import graphql.kickstart.execution.input.GraphQLSingleInvocationInput;
Expand Down Expand Up @@ -53,7 +51,7 @@ private void execute(GraphQLInvocationInput invocationInput, HttpServletRequest
try {
GraphQLQueryResult queryResult = invoke(invocationInput, request, response);

QueryResponseWriter queryResponseWriter = createWriter(queryResult, configuration.getObjectMapper(),
QueryResponseWriter queryResponseWriter = QueryResponseWriter.createWriter(queryResult, configuration.getObjectMapper(),
configuration.getSubscriptionTimeout());
queryResponseWriter.write(request, response);
} catch (Throwable t) {
Expand Down
30 changes: 15 additions & 15 deletions ...aphql/servlet/OsgiGraphQLHttpServlet.java → ...start/servlet/OsgiGraphQLHttpServlet.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import static graphql.schema.GraphQLObjectType.newObject;
import static graphql.schema.GraphQLSchema.newSchema;
Expand All @@ -12,31 +12,31 @@
import aQute.bnd.component.annotations.ReferencePolicyOption;
import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
import graphql.execution.preparsed.PreparsedDocumentProvider;
import graphql.kickstart.servlet.config.DefaultGraphQLSchemaServletProvider;
import graphql.schema.GraphQLCodeRegistry;
import graphql.schema.GraphQLObjectType;
import graphql.schema.GraphQLType;
import graphql.kickstart.execution.config.DefaultExecutionStrategyProvider;
import graphql.servlet.config.DefaultGraphQLSchemaServletProvider;
import graphql.kickstart.execution.config.ExecutionStrategyProvider;
import graphql.servlet.config.GraphQLSchemaServletProvider;
import graphql.servlet.core.GraphQLServletRootObjectBuilder;
import graphql.servlet.osgi.GraphQLCodeRegistryProvider;
import graphql.servlet.osgi.GraphQLMutationProvider;
import graphql.servlet.osgi.GraphQLProvider;
import graphql.servlet.osgi.GraphQLQueryProvider;
import graphql.servlet.osgi.GraphQLSubscriptionProvider;
import graphql.servlet.osgi.GraphQLTypesProvider;
import graphql.kickstart.servlet.config.GraphQLSchemaServletProvider;
import graphql.kickstart.servlet.core.GraphQLServletRootObjectBuilder;
import graphql.kickstart.servlet.osgi.GraphQLCodeRegistryProvider;
import graphql.kickstart.servlet.osgi.GraphQLMutationProvider;
import graphql.kickstart.servlet.osgi.GraphQLProvider;
import graphql.kickstart.servlet.osgi.GraphQLQueryProvider;
import graphql.kickstart.servlet.osgi.GraphQLSubscriptionProvider;
import graphql.kickstart.servlet.osgi.GraphQLTypesProvider;
import graphql.kickstart.execution.config.InstrumentationProvider;
import graphql.servlet.context.DefaultGraphQLServletContextBuilder;
import graphql.servlet.context.GraphQLServletContextBuilder;
import graphql.kickstart.servlet.context.DefaultGraphQLServletContextBuilder;
import graphql.kickstart.servlet.context.GraphQLServletContextBuilder;
import graphql.kickstart.execution.error.DefaultGraphQLErrorHandler;
import graphql.servlet.core.DefaultGraphQLRootObjectBuilder;
import graphql.kickstart.servlet.core.DefaultGraphQLRootObjectBuilder;
import graphql.kickstart.execution.error.GraphQLErrorHandler;
import graphql.kickstart.execution.GraphQLObjectMapper;
import graphql.kickstart.execution.GraphQLQueryInvoker;
import graphql.kickstart.execution.GraphQLRootObjectBuilder;
import graphql.servlet.core.GraphQLServletListener;
import graphql.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.servlet.core.GraphQLServletListener;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.execution.instrumentation.NoOpInstrumentationProvider;
import java.util.ArrayList;
import java.util.HashSet;
Expand Down
2 changes: 1 addition & 1 deletion .../graphql/servlet/QueryResponseWriter.java → ...ickstart/servlet/QueryResponseWriter.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import graphql.kickstart.execution.GraphQLQueryResult;
import graphql.kickstart.execution.GraphQLObjectMapper;
Expand Down
8 changes: 4 additions & 4 deletions ...hql/servlet/SimpleGraphQLHttpServlet.java → ...art/servlet/SimpleGraphQLHttpServlet.java
View file
@@ -1,11 +1,11 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import graphql.kickstart.execution.GraphQLObjectMapper;
import graphql.kickstart.execution.GraphQLQueryInvoker;
import graphql.kickstart.servlet.config.GraphQLSchemaServletProvider;
import graphql.schema.GraphQLSchema;
import graphql.servlet.config.GraphQLSchemaServletProvider;
import graphql.servlet.core.GraphQLServletListener;
import graphql.servlet.input.GraphQLInvocationInputFactory;
import graphql.kickstart.servlet.core.GraphQLServletListener;
import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
Expand Down
9 changes: 3 additions & 6 deletions ...ingleAsynchronousQueryResponseWriter.java → ...ingleAsynchronousQueryResponseWriter.java
View file
@@ -1,7 +1,4 @@
package graphql.servlet;

import static graphql.servlet.HttpRequestHandler.APPLICATION_EVENT_STREAM_UTF8;
import static graphql.servlet.HttpRequestHandler.STATUS_OK;
package graphql.kickstart.servlet;

import graphql.ExecutionResult;
import graphql.GraphQL;
Expand Down Expand Up @@ -29,8 +26,8 @@ class SingleAsynchronousQueryResponseWriter implements QueryResponseWriter {
@Override
public void write(HttpServletRequest request, HttpServletResponse response) {
Objects.requireNonNull(request, "Http servlet request cannot be null");
response.setContentType(APPLICATION_EVENT_STREAM_UTF8);
response.setStatus(STATUS_OK);
response.setContentType(HttpRequestHandler.APPLICATION_EVENT_STREAM_UTF8);
response.setStatus(HttpRequestHandler.STATUS_OK);

boolean isInAsyncThread = request.isAsyncStarted();
AsyncContext asyncContext = isInAsyncThread ? request.getAsyncContext() : request.startAsync(request, response);
Expand Down
10 changes: 3 additions & 7 deletions ...ql/servlet/SingleQueryResponseWriter.java → ...rt/servlet/SingleQueryResponseWriter.java
View file
@@ -1,12 +1,8 @@
package graphql.servlet;

import static graphql.servlet.HttpRequestHandler.APPLICATION_JSON_UTF8;
import static graphql.servlet.HttpRequestHandler.STATUS_OK;
package graphql.kickstart.servlet;

import graphql.ExecutionResult;
import graphql.kickstart.execution.GraphQLObjectMapper;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Expand All @@ -20,8 +16,8 @@ class SingleQueryResponseWriter implements QueryResponseWriter {

@Override
public void write(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.setContentType(APPLICATION_JSON_UTF8);
response.setStatus(STATUS_OK);
response.setContentType(HttpRequestHandler.APPLICATION_JSON_UTF8);
response.setStatus(HttpRequestHandler.STATUS_OK);
String responseContent = graphQLObjectMapper.serializeResultAsJson(result);
response.setContentLength(responseContent.getBytes(StandardCharsets.UTF_8).length);
response.getWriter().write(responseContent);
Expand Down
2 changes: 1 addition & 1 deletion .../graphql/servlet/StaticDataPublisher.java → ...ickstart/servlet/StaticDataPublisher.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import graphql.execution.reactive.SingleSubscriberPublisher;
import org.reactivestreams.Publisher;
Expand Down
2 changes: 1 addition & 1 deletion ...ql/servlet/SubscriptionAsyncListener.java → ...rt/servlet/SubscriptionAsyncListener.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet;
package graphql.kickstart.servlet;

import java.util.concurrent.atomic.AtomicReference;
import javax.servlet.AsyncEvent;
Expand Down
2 changes: 1 addition & 1 deletion ...graphql/servlet/apollo/ApolloScalars.java → ...ckstart/servlet/apollo/ApolloScalars.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet.apollo;
package graphql.kickstart.servlet.apollo;

import graphql.schema.Coercing;
import graphql.schema.CoercingParseLiteralException;
Expand Down
4 changes: 2 additions & 2 deletions ...WebSocketSubscriptionProtocolFactory.java → ...WebSocketSubscriptionProtocolFactory.java
View file
@@ -1,4 +1,4 @@
package graphql.servlet.apollo;
package graphql.kickstart.servlet.apollo;

import graphql.kickstart.execution.GraphQLInvoker;
import graphql.kickstart.execution.GraphQLObjectMapper;
Expand All @@ -7,7 +7,7 @@
import graphql.kickstart.execution.subscriptions.SubscriptionSession;
import graphql.kickstart.execution.subscriptions.apollo.ApolloSubscriptionConnectionListener;
import graphql.kickstart.execution.subscriptions.apollo.ApolloSubscriptionProtocolFactory;
import graphql.servlet.subscriptions.WebSocketSubscriptionProtocolFactory;
import graphql.kickstart.servlet.subscriptions.WebSocketSubscriptionProtocolFactory;
import java.time.Duration;
import java.util.Collection;
import javax.websocket.Session;
Expand Down

0 comments on commit 38af304

Please sign in to comment.