Split based on servlet and websocket dependencies

Author: oliemansm

src/main/java/graphql/servlet/DecoratedExecutionResult.java renamed to src/main/java/graphql/kickstart/execution/DecoratedExecutionResult.java

@@ -1,4 +1,4 @@
-package graphql.servlet;
+package graphql.kickstart.execution;
 
 import graphql.ExecutionResult;
 import graphql.GraphQL;
@@ -13,15 +13,11 @@ class DecoratedExecutionResult implements ExecutionResult {
 
   private final ExecutionResult result;
 
-  static DecoratedExecutionResult decorate(ExecutionResult result) {
-    return new DecoratedExecutionResult(result);
-  }
-
   boolean isAsynchronous() {
     return result.getData() instanceof Publisher || isDeferred();
   }
 
-  boolean isDeferred() {
+  private boolean isDeferred() {
     return result.getExtensions() != null && result.getExtensions().containsKey(GraphQL.DEFERRED_RESULTS);
   }
 

src/main/java/graphql/servlet/GraphQLBatchedQueryResult.java renamed to src/main/java/graphql/kickstart/execution/GraphQLBatchedQueryResult.java

@@ -1,4 +1,4 @@
-package graphql.servlet;
+package graphql.kickstart.execution;
 
 import graphql.ExecutionResult;
 import java.util.List;

src/main/java/graphql/servlet/GraphQLErrorQueryResult.java renamed to src/main/java/graphql/kickstart/execution/GraphQLErrorQueryResult.java

@@ -1,4 +1,4 @@
-package graphql.servlet;
+package graphql.kickstart.execution;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/graphql/servlet/core/GraphQLQueryInvoker.java renamed to src/main/java/graphql/kickstart/execution/GraphQLQueryInvoker.java

@@ -1,4 +1,4 @@
-package graphql.servlet.core;
+package graphql.kickstart.execution;
 
 import graphql.ExecutionInput;
 import graphql.ExecutionResult;
@@ -11,13 +11,12 @@
 import graphql.execution.preparsed.NoOpPreparsedDocumentProvider;
 import graphql.execution.preparsed.PreparsedDocumentProvider;
 import graphql.schema.GraphQLSchema;
-import graphql.servlet.GraphQLQueryResult;
-import graphql.servlet.config.DefaultExecutionStrategyProvider;
-import graphql.servlet.config.ExecutionStrategyProvider;
-import graphql.servlet.context.ContextSetting;
-import graphql.servlet.input.GraphQLBatchedInvocationInput;
-import graphql.servlet.input.GraphQLInvocationInput;
-import graphql.servlet.input.GraphQLSingleInvocationInput;
+import graphql.kickstart.execution.config.DefaultExecutionStrategyProvider;
+import graphql.kickstart.execution.config.ExecutionStrategyProvider;
+import graphql.kickstart.execution.context.ContextSetting;
+import graphql.kickstart.execution.input.GraphQLBatchedInvocationInput;
+import graphql.kickstart.execution.input.GraphQLInvocationInput;
+import graphql.kickstart.execution.input.GraphQLSingleInvocationInput;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.List;

src/main/java/graphql/servlet/GraphQLQueryResult.java renamed to src/main/java/graphql/kickstart/execution/GraphQLQueryResult.java

@@ -1,4 +1,4 @@
-package graphql.servlet;
+package graphql.kickstart.execution;
 
 import static java.util.Collections.emptyList;
 
@@ -15,6 +15,10 @@ static GraphQLBatchedQueryResult create(List<ExecutionResult> results) {
     return new GraphQLBatchedQueryResult(results);
   }
 
+  static GraphQLErrorQueryResult createError(int statusCode, String message) {
+    return new GraphQLErrorQueryResult(statusCode, message);
+  }
+
   boolean isBatched();
 
   boolean isAsynchronous();
@@ -28,4 +32,12 @@ default List<ExecutionResult> getResults() {
   }
 
   default boolean isError() { return false; }
+
+  default int getStatusCode() {
+    return 200;
+  }
+
+  default String getMessage() {
+    return null;
+  }
 }

src/main/java/graphql/servlet/GraphQLSingleQueryResult.java renamed to src/main/java/graphql/kickstart/execution/GraphQLSingleQueryResult.java

@@ -1,4 +1,4 @@
-package graphql.servlet;
+package graphql.kickstart.execution;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/graphql/servlet/config/ConfiguringObjectMapperProvider.java renamed to src/main/java/graphql/kickstart/execution/config/ConfiguringObjectMapperProvider.java

@@ -1,9 +1,7 @@
-package graphql.servlet.config;
+package graphql.kickstart.execution.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import graphql.servlet.config.ObjectMapperConfigurer;
-import graphql.servlet.config.ObjectMapperProvider;
-import graphql.servlet.core.DefaultObjectMapperConfigurer;
+import graphql.kickstart.execution.error.DefaultObjectMapperConfigurer;
 
 public class ConfiguringObjectMapperProvider implements ObjectMapperProvider {
 

src/main/java/graphql/kickstart/execution/config/DefaultExecutionStrategyProvider.java

@@ -0,0 +1,51 @@
+package graphql.kickstart.execution.config;
+
+import graphql.execution.AsyncExecutionStrategy;
+import graphql.execution.ExecutionStrategy;
+import graphql.execution.SubscriptionExecutionStrategy;
+
+/**
+ * @author Andrew Potter
+ */
+public class DefaultExecutionStrategyProvider implements ExecutionStrategyProvider {
+
+  private final ExecutionStrategy queryExecutionStrategy;
+  private final ExecutionStrategy mutationExecutionStrategy;
+  private final ExecutionStrategy subscriptionExecutionStrategy;
+
+  public DefaultExecutionStrategyProvider() {
+    this(null);
+  }
+
+  public DefaultExecutionStrategyProvider(ExecutionStrategy executionStrategy) {
+    this(executionStrategy, null, null);
+  }
+
+  public DefaultExecutionStrategyProvider(ExecutionStrategy queryExecutionStrategy,
+      ExecutionStrategy mutationExecutionStrategy, ExecutionStrategy subscriptionExecutionStrategy) {
+    this.queryExecutionStrategy = defaultIfNull(queryExecutionStrategy, new AsyncExecutionStrategy());
+    this.mutationExecutionStrategy = defaultIfNull(mutationExecutionStrategy, this.queryExecutionStrategy);
+    this.subscriptionExecutionStrategy = defaultIfNull(subscriptionExecutionStrategy,
+        new SubscriptionExecutionStrategy());
+  }
+
+  private ExecutionStrategy defaultIfNull(ExecutionStrategy executionStrategy, ExecutionStrategy defaultStrategy) {
+    return executionStrategy != null ? executionStrategy : defaultStrategy;
+  }
+
+  @Override
+  public ExecutionStrategy getQueryExecutionStrategy() {
+    return queryExecutionStrategy;
+  }
+
+  @Override
+  public ExecutionStrategy getMutationExecutionStrategy() {
+    return mutationExecutionStrategy;
+  }
+
+  @Override
+  public ExecutionStrategy getSubscriptionExecutionStrategy() {
+    return subscriptionExecutionStrategy;
+  }
+
+}

src/main/java/graphql/servlet/config/ExecutionStrategyProvider.java renamed to src/main/java/graphql/kickstart/execution/config/ExecutionStrategyProvider.java

@@ -1,4 +1,4 @@
-package graphql.servlet.config;
+package graphql.kickstart.execution.config;
 
 import graphql.execution.ExecutionStrategy;
 

src/main/java/graphql/servlet/config/GraphQLCodeRegistryProvider.java renamed to src/main/java/graphql/kickstart/execution/config/GraphQLCodeRegistryProvider.java

@@ -1,6 +1,7 @@
-package graphql.servlet.config;
+package graphql.kickstart.execution.config;
 
 import graphql.schema.GraphQLCodeRegistry;
+import graphql.servlet.osgi.GraphQLProvider;
 
 public interface GraphQLCodeRegistryProvider extends GraphQLProvider {
     GraphQLCodeRegistry getCodeRegistry();